Commit 42593a83 authored by deuce's avatar deuce
Browse files

More cruft scraping.

parent 0812bf10
...@@ -156,11 +156,7 @@ bool sbbs_t::ar_exp(uchar **ptrptr, user_t* user) ...@@ -156,11 +156,7 @@ bool sbbs_t::ar_exp(uchar **ptrptr, user_t* user)
#endif #endif
break; break;
case AR_DOS: case AR_DOS:
#ifdef __FLAT__ result=_not;
result=_not;
#else
result=!_not;
#endif
break; break;
case AR_WIN32: case AR_WIN32:
#ifndef _WIN32 #ifndef _WIN32
......
...@@ -265,9 +265,6 @@ int sbbs_t::exec_function(csi_t *csi) ...@@ -265,9 +265,6 @@ int sbbs_t::exec_function(csi_t *csi)
change_user(); change_user();
return(0); return(0);
case CS_SHOW_MEM: case CS_SHOW_MEM:
#ifdef __MSDOS__
bprintf(text[NBytesFreeMemory],farcoreleft());
#endif
return(0); return(0);
case CS_ERROR_LOG: case CS_ERROR_LOG:
sprintf(str,"%serror.log", cfg.logs_dir); sprintf(str,"%serror.log", cfg.logs_dir);
......
...@@ -329,13 +329,6 @@ void sbbs_t::errormsg(int line, const char *source, char action, const char *obj ...@@ -329,13 +329,6 @@ void sbbs_t::errormsg(int line, const char *source, char action, const char *obj
strcat(str,tmp); strcat(str,tmp);
errno=0; errno=0;
} }
#if defined(__MSDOS__)
if(_doserrno && _doserrno!=(ulong)errno) {
sprintf(tmp,"\r\n doserrno: %d",_doserrno);
strcat(str,tmp);
}
_doserrno=0;
#endif
#if defined(_WIN32) #if defined(_WIN32)
if(GetLastError()!=0) { if(GetLastError()!=0) {
sprintf(tmp,"\r\n WinError: %d (0x%X)",GetLastError(), GetLastError()); sprintf(tmp,"\r\n WinError: %d (0x%X)",GetLastError(), GetLastError());
......
...@@ -59,9 +59,6 @@ ...@@ -59,9 +59,6 @@
#define O_DENYNONE SH_DENYNO #define O_DENYNONE SH_DENYNO
#endif #endif
#ifdef __MSDOS__
extern uchar node_swap;
#endif
extern long misc; extern long misc;
extern config_t cfg; extern config_t cfg;
...@@ -283,9 +280,6 @@ void read_echo_cfg() ...@@ -283,9 +280,6 @@ void read_echo_cfg()
continue; } continue; }
if(!stricmp(tmp,"NOSWAP")) { if(!stricmp(tmp,"NOSWAP")) {
#ifdef __MSDOS__
node_swap=0;
#endif
continue; } continue; }
if(!stricmp(tmp,"SECURE_ECHOMAIL")) { if(!stricmp(tmp,"SECURE_ECHOMAIL")) {
......
...@@ -1088,15 +1088,11 @@ extern ...@@ -1088,15 +1088,11 @@ extern
/* Global data */ /* Global data */
#if defined(__FLAT__) || defined(_WIN32) /* ToDo: These should be hunted down and killed */
#define lread(f,b,l) read(f,b,l) #define lread(f,b,l) read(f,b,l)
#define lfread(b,l,f) fread(b,l,f) #define lfread(b,l,f) fread(b,l,f)
#define lwrite(f,b,l) write(f,b,l) #define lwrite(f,b,l) write(f,b,l)
#define lfwrite(b,l,f) fwrite(b,l,f) #define lfwrite(b,l,f) fwrite(b,l,f)
#define lkbrd(x) 0 #define lkbrd(x) 0
#endif
#endif /* Don't add anything after this line */ #endif /* Don't add anything after this line */
...@@ -88,10 +88,6 @@ typedef struct { ...@@ -88,10 +88,6 @@ typedef struct {
#define JSVAL_NULL_OR_VOID(val) (JSVAL_IS_NULL(val) || JSVAL_IS_VOID(val)) #define JSVAL_NULL_OR_VOID(val) (JSVAL_IS_NULL(val) || JSVAL_IS_VOID(val))
#ifndef __FLAT__
#define __FLAT__ /* 32-bit "flat" memory model */
#endif
/************/ /************/
/* Maximums */ /* Maximums */
/************/ /************/
......
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
#include "scfglib.h" #include "scfglib.h"
#include "lzh.h" #include "lzh.h"
#include "sbbsecho.h" #include "sbbsecho.h"
#include "genwrap.h" /* PLATFORM_DESC */
smb_t *smb,*email; smb_t *smb,*email;
long misc=(IMPORT_PACKETS|IMPORT_NETMAIL|IMPORT_ECHOMAIL|EXPORT_ECHOMAIL long misc=(IMPORT_PACKETS|IMPORT_NETMAIL|IMPORT_ECHOMAIL|EXPORT_ECHOMAIL
...@@ -3976,21 +3977,7 @@ int main(int argc, char **argv) ...@@ -3976,21 +3977,7 @@ int main(int argc, char **argv)
printf("\nSBBSecho v%s-%s (rev %s) - Synchronet FidoNet Packet " printf("\nSBBSecho v%s-%s (rev %s) - Synchronet FidoNet Packet "
"Tosser\n" "Tosser\n"
,SBBSECHO_VER ,SBBSECHO_VER
#ifdef PLATFORM_DESC
,PLATFORM_DESC ,PLATFORM_DESC
#else
#if defined(__OS2__)
,"OS/2"
#elif defined(__NT__)
,"Win32"
#elif defined(__DOS4G__)
,"DOS4G"
#elif defined(__FLAT__)
,"DOS32"
#else
,"DOS16"
#endif
#endif
,revision ,revision
); );
......
...@@ -1360,11 +1360,7 @@ static BOOL ar_exp(scfg_t* cfg, uchar **ptrptr, user_t* user) ...@@ -1360,11 +1360,7 @@ static BOOL ar_exp(scfg_t* cfg, uchar **ptrptr, user_t* user)
#endif #endif
break; break;
case AR_DOS: case AR_DOS:
#ifdef __FLAT__ result=not;
result=not;
#else
result=!not;
#endif
break; break;
case AR_WIN32: case AR_WIN32:
#ifndef _WIN32 #ifndef _WIN32
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment