ALT Linux Sisyphus

From c0d057c5f1b812725f1b2a18e391135f47f9f1d0 Mon Sep 17 00:00:00 2001
From: elfmz <fenix1905@tut.by>
Date: Wed, 19 Jan 2022 20:18:48 +0300
Subject: [PATCH 14/16] remove stuff that breaks lcc compilation; cosmetic

---
 NetRocks/src/ConnectionsPool.cpp       |  1 -
 WinPort/src/APIMemory.cpp              | 38 --------------------------
 far2l/far2sdk/farplug-wide.h           |  3 --
 multiarc/src/fmt.hpp                   |  3 --
 multiarc/src/formats/7z/7z.cpp         |  3 --
 multiarc/src/formats/ace/ace.cpp       |  3 --
 multiarc/src/formats/arc/arc.cpp       |  3 --
 multiarc/src/formats/arj/arj.cpp       |  3 --
 multiarc/src/formats/cab/cab.cpp       |  3 --
 multiarc/src/formats/custom/custom.cpp |  3 --
 multiarc/src/formats/ha/ha.cpp         |  3 --
 multiarc/src/formats/ha/ha/machine.c   |  2 +-
 multiarc/src/formats/lzh/lzh.cpp       |  3 --
 multiarc/src/formats/targz/targz.cpp   |  3 --
 multiarc/src/formats/zip/zip.cpp       |  3 --
 15 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 WinPort/src/APIMemory.cpp

diff --git a/NetRocks/src/ConnectionsPool.cpp b/NetRocks/src/ConnectionsPool.cpp
index 4651b51e..a96321c1 100644
--- a/NetRocks/src/ConnectionsPool.cpp
+++ b/NetRocks/src/ConnectionsPool.cpp
@@ -39,7 +39,6 @@ std::shared_ptr<IHost> ConnectionsPool::Get(const std::string &id)
 {
 	std::shared_ptr<IHost> out;
 
-	std::vector<std::shared_ptr<IHost> > purgeds; // destroy hosts out of lock
 	std::lock_guard<std::mutex> locker(_mutex);
 
 	auto it = _id_2_pooled_host.find(id);
diff --git a/WinPort/src/APIMemory.cpp b/WinPort/src/APIMemory.cpp
deleted file mode 100644
index 7cb4ec1d..00000000
--- a/WinPort/src/APIMemory.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <string>
-#include <locale> 
-#include <set> 
-#include <vector>
-#include <algorithm>
-#include <iostream>
-#include <fstream>
-#include <mutex>
-
-#include "WinCompat.h"
-#include "WinPort.h"
-#include "WinPortHandle.h"
-#include "PathHelpers.h"
-
-WINPORT_DECL(GlobalAlloc, HGLOBAL, ( UINT   uFlags, SIZE_T dwBytes))
-{
-	PVOID rv = malloc(dwBytes);
-	if (rv && (uFlags&GMEM_ZEROINIT)==GMEM_ZEROINIT)
-		memset(rv, 0, dwBytes);
-	return rv;
-}
-
-WINPORT_DECL(GlobalFree, HGLOBAL, ( HGLOBAL hMem))
-{
-	free(hMem);
-	return NULL;
-}
-
-WINPORT_DECL(GlobalLock, PVOID, ( HGLOBAL hMem))
-{
-	return hMem;
-}
-
-WINPORT_DECL(GlobalUnlock, BOOL, ( HGLOBAL hMem))
-{
-	return TRUE;
-}
-
diff --git a/far2l/far2sdk/farplug-wide.h b/far2l/far2sdk/farplug-wide.h
index 8842fe91..4c1c31a5 100644
--- a/far2l/far2sdk/farplug-wide.h
+++ b/far2l/far2sdk/farplug-wide.h
@@ -106,9 +106,6 @@ other possible license with no implications from the above license on them.
 #ifndef _WIN64
 #pragma pack(2)
 #endif
-#if defined(__LCC__)
-#define _export __declspec(dllexport)
-#endif
 #else
 #ifndef _WIN64
 #pragma pack(push,2)
diff --git a/multiarc/src/fmt.hpp b/multiarc/src/fmt.hpp
index 3ebacdca..46a01751 100644
--- a/multiarc/src/fmt.hpp
+++ b/multiarc/src/fmt.hpp
@@ -14,9 +14,6 @@
   #pragma option -a2
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(2)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,2)
   #if _MSC_VER
diff --git a/multiarc/src/formats/7z/7z.cpp b/multiarc/src/formats/7z/7z.cpp
index 6b6eb741..650520b8 100644
--- a/multiarc/src/formats/7z/7z.cpp
+++ b/multiarc/src/formats/7z/7z.cpp
@@ -34,9 +34,6 @@ using namespace oldfar;
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
diff --git a/multiarc/src/formats/ace/ace.cpp b/multiarc/src/formats/ace/ace.cpp
index 843d5ec2..f3f2eb51 100644
--- a/multiarc/src/formats/ace/ace.cpp
+++ b/multiarc/src/formats/ace/ace.cpp
@@ -23,9 +23,6 @@ using namespace oldfar;
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
diff --git a/multiarc/src/formats/arc/arc.cpp b/multiarc/src/formats/arc/arc.cpp
index 27a8e003..b081ef29 100644
--- a/multiarc/src/formats/arc/arc.cpp
+++ b/multiarc/src/formats/arc/arc.cpp
@@ -18,9 +18,6 @@ using namespace oldfar;
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
diff --git a/multiarc/src/formats/arj/arj.cpp b/multiarc/src/formats/arj/arj.cpp
index e492e1b7..db124d49 100644
--- a/multiarc/src/formats/arj/arj.cpp
+++ b/multiarc/src/formats/arj/arj.cpp
@@ -19,9 +19,6 @@ using namespace oldfar;
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
diff --git a/multiarc/src/formats/cab/cab.cpp b/multiarc/src/formats/cab/cab.cpp
index ded569f6..7ebb52f9 100644
--- a/multiarc/src/formats/cab/cab.cpp
+++ b/multiarc/src/formats/cab/cab.cpp
@@ -21,9 +21,6 @@ using namespace oldfar;
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
diff --git a/multiarc/src/formats/custom/custom.cpp b/multiarc/src/formats/custom/custom.cpp
index 15b7dd9e..7e3aee37 100644
--- a/multiarc/src/formats/custom/custom.cpp
+++ b/multiarc/src/formats/custom/custom.cpp
@@ -31,9 +31,6 @@ using namespace PCRE;
     #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
     #pragma pack(1)
-    #if defined(__LCC__)
-        #define _export __declspec(dllexport)
-    #endif
 #else
     #pragma pack(push,1)
     #if _MSC_VER
diff --git a/multiarc/src/formats/ha/ha.cpp b/multiarc/src/formats/ha/ha.cpp
index 5e6a3674..bcb17465 100644
--- a/multiarc/src/formats/ha/ha.cpp
+++ b/multiarc/src/formats/ha/ha.cpp
@@ -19,9 +19,6 @@ using namespace oldfar;
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
diff --git a/multiarc/src/formats/ha/ha/machine.c b/multiarc/src/formats/ha/ha/machine.c
index 5bf17a8d..13e9fabd 100644
--- a/multiarc/src/formats/ha/ha/machine.c
+++ b/multiarc/src/formats/ha/ha/machine.c
@@ -343,7 +343,7 @@ void md_listdat(void) {
 
 char *md_timestring(unsigned long t) {
     
-    static char ts[22];
+    static char ts[40];
     struct tm *tim;	
     
     tim=localtime((long *)&t);
diff --git a/multiarc/src/formats/lzh/lzh.cpp b/multiarc/src/formats/lzh/lzh.cpp
index b387cbea..05295dec 100644
--- a/multiarc/src/formats/lzh/lzh.cpp
+++ b/multiarc/src/formats/lzh/lzh.cpp
@@ -19,9 +19,6 @@ using namespace oldfar;
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
diff --git a/multiarc/src/formats/targz/targz.cpp b/multiarc/src/formats/targz/targz.cpp
index 9fd26c89..f083c7cc 100644
--- a/multiarc/src/formats/targz/targz.cpp
+++ b/multiarc/src/formats/targz/targz.cpp
@@ -21,9 +21,6 @@ using namespace oldfar;
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
diff --git a/multiarc/src/formats/zip/zip.cpp b/multiarc/src/formats/zip/zip.cpp
index 395fc657..860a3cdb 100644
--- a/multiarc/src/formats/zip/zip.cpp
+++ b/multiarc/src/formats/zip/zip.cpp
@@ -46,9 +46,6 @@ static BOOL CPToUTF8( UINT cp, LPCSTR s, LPSTR d, int dlen )
   #pragma option -a1
 #elif defined(__GNUC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1100)) || defined(__LCC__)
   #pragma pack(1)
-  #if defined(__LCC__)
-    #define _export __declspec(dllexport)
-  #endif
 #else
   #pragma pack(push,1)
   #if _MSC_VER
-- 
2.33.0