Fixed compilation issues caused by the last commit of SMB, fixed hang on broken SMB

2002-09-03 07:17:19 +00:00
parent 765ec7097d
commit 36ab81f044
2 changed files with 21 additions and 17 deletions
--- a/goldlib/smblib/smbdefs.h
+++ b/goldlib/smblib/smbdefs.h
@@ -377,7 +377,9 @@ enum {
 /************/

 #if defined(_WIN32) || defined(__BORLANDC__)
-	#define PRAGMA_PACK
+	#ifndef PRAGMA_PACK
+		#define PRAGMA_PACK
+	#endif
 #endif

 #if defined(PRAGMA_PACK)
@@ -487,7 +489,7 @@ typedef struct _PACK {		// Network (type and address)

 #if defined(PRAGMA_PACK)
 #if defined(__GNUC__)
-#define pack()
+#pragma pack()
 #else
 #pragma pack(pop)		/* original packing */
 #endif