bugfixing

goldlib/gcfg/gs_xbbs.h

@@ -26,6 +26,22 @@
 #pragma pack(1)
 #endif
 
+//  ------------------------------------------------------------------
+
+#ifdef __OS2__
+#define INCL_BASE
+#include <os2.h>
+#else
+typedef char CHAR;
+typedef unsigned char UCHAR;
+typedef short SHORT;
+typedef unsigned short USHORT;
+typedef long LONG;
+typedef unsigned long ULONG;
+typedef unsigned char *PSZ;
+#endif
+
+
 //  ------------------------------------------------------------------
 
 #define SMALLEST_MSG_SIZE_FOR_PACKING   384
@@ -332,7 +348,6 @@ typedef struct _msgarea MSGAREA, *PMSGAREA;		  //JM931019
 	#define M_FIDO       0x00100000                   /* Star . msg Format       */
 	#define M_JAM        0x00200000                   /* JAM msg Format          */
 
-
 struct _filearea
 	{
 	char             *name;

goldlib/gcfg/gxwtr.cpp

@@ -187,7 +187,7 @@ void gareafile::ReadWtrGte(char* tag) {
   if(fp) {
     char header[26];
     if(not quiet)
-      printf(NL "* Reading %s", file);
+      cout << "* Reading " << file << endl;
     fread(header, 26, 1, fp); strp2c(header);
     
     if(streql(header, ConfigHeader))

goldlib/gcfg/gxxbbs.cpp

@@ -29,12 +29,6 @@
 #include <gstrall.h>
 #undef GCFG_NOXBBS
 #include <gedacfg.h>
-
-#ifdef __OS2__
-
-#define INCL_BASE
-#include <os2.h>
-
 #include <gs_xbbs.h>
 
 
@@ -153,16 +147,12 @@ void gareafile::ReadAdeptXbbsFile(char* path, char* file, char* options) {
   }
 }
 
-#endif
-
 
 //  ------------------------------------------------------------------
 //  Read areas from AdeptXBBS
 
 void gareafile::ReadAdeptXBBS(char* tag) {
 
-  #ifdef __OS2__
-
   char options[80];
   Path file, path, cfg;
 
@@ -183,12 +173,6 @@ void gareafile::ReadAdeptXBBS(char* tag) {
   CfgAdeptxbbspath(path);
 
   ReadAdeptXbbsFile(path, file, options);
-
-  #else
-
-  NW(tag);
-
-  #endif
 }