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
 }
 
 

goldlib/gmb3/gmb3.all

@@ -57,11 +57,11 @@ gmowcat2 cpp     all nov     bco bcx wcn wco wcx lnx emx djg rsx cyg
 gmowcat3 cpp     all nov     bco bcx wcn wco wcx lnx emx djg rsx cyg
 gmowcat4 cpp     all nov     bco bcx wcn wco wcx lnx emx djg rsx cyg
 gmowcat5 cpp     all nov     bco bcx wcn wco wcx lnx emx djg rsx cyg
-gmoxbbs1 cpp     all nov     bco         wco         emx
-gmoxbbs2 cpp     all nov     bco         wco         emx
-gmoxbbs3 cpp     all nov     bco         wco         emx
-gmoxbbs4 cpp     all nov     bco         wco         emx
-gmoxbbs5 cpp     all nov     bco         wco         emx
+gmoxbbs1 cpp     all nov     bco         wco     lnx emx djg     cyg
+gmoxbbs2 cpp     all nov     bco         wco     lnx emx djg     cyg
+gmoxbbs3 cpp     all nov     bco         wco     lnx emx djg     cyg
+gmoxbbs4 cpp     all nov     bco         wco     lnx emx djg     cyg
+gmoxbbs5 cpp     all nov     bco         wco     lnx emx djg     cyg
 
 ##  ------------------------------------------------------------------
 

goldlib/gmb3/gmoprot.h

@@ -119,21 +119,5 @@ void XbbsWideOpen();
 void XbbsWideClose();
 
 
-//  ------------------------------------------------------------------
-//  When not in OS/2, use DUMMY AdeptXBBS functions
-
-#if !defined(__OS2__)
-
-#ifndef GMB_NOXBBS
-inline void XbbsInit(const char*, int) { }
-inline void XbbsExit() { }
-
-inline void XbbsWideOpen() { }
-inline void XbbsWideClose() { }
-#endif
-
-#endif
-
-
 //  ------------------------------------------------------------------
 

goldlib/gmb3/gmoxbbs.h

@@ -251,34 +251,6 @@ extern XbbsData* xbbsdata;
 extern int       xbbsdatano;
 
 
-//  ------------------------------------------------------------------
-
-#if !defined(__OS2__)
-inline void XbbsArea::open() { }
-inline void XbbsArea::save_lastread() { }
-inline void XbbsArea::close() { }
-inline void XbbsArea::suspend() { }
-inline void XbbsArea::resume() { }
-inline void XbbsArea::scan() { }
-inline void XbbsArea::scan_area() { }
-inline void XbbsArea::scan_area_pm() { }
-inline int XbbsArea::load_message(int, gmsg*, XbbsHdr&) { return false; }
-inline int XbbsArea::load_hdr(gmsg*) { return false; }
-inline int XbbsArea::load_msg(gmsg*) { return false; }
-inline void XbbsArea::lock() { }
-inline void XbbsArea::unlock() { }
-inline void XbbsArea::save_message(int, gmsg*, XbbsHdr&) { }
-inline void XbbsArea::save_hdr(int, gmsg*) { }
-inline void XbbsArea::save_msg(int, gmsg*) { }
-inline void XbbsArea::del_msg(gmsg*) { }
-inline void XbbsArea::new_msgno(gmsg*) { }
-inline char* XbbsArea::user_lookup(char*) { return NULL; }
-inline int XbbsArea::renumber() { return false; }
-inline void XbbsArea::update_timesread(gmsg*) { }
-inline Line* XbbsArea::make_dump_msg(Line*&, gmsg*, char* lng_head) { return NULL; }
-#endif
-
-
 //  ------------------------------------------------------------------
 
 #endif