diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/build.c b/cde/programs/dthelp/parser.ccdf/htag/build/build.c index 0fce96e78..6183275b7 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/build.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/build.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "context.h" #define BUILDEF #include "build.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/out.c b/cde/programs/dthelp/parser.ccdf/htag/build/out.c index e2503cea0..a13b2dcf3 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/out.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/out.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "context.h" #include "build.h" #include "delim.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/scan.c b/cde/programs/dthelp/parser.ccdf/htag/build/scan.c index df96b1370..362d831bc 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/scan.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/scan.c @@ -30,9 +30,6 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Scan.c contains scanner procedures for program BUILD */ #include -#if defined(MSDOS) -#include -#endif #include "build.h" #define M_CONDEF #include "context.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c index 2ffd8b065..46506ecf2 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c index d5684d984..b83887531 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c index 654986ba9..ab10a6527 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c index 8c992f71a..f39f88017 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c @@ -32,15 +32,6 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co. #include "globdec.h" #include - -#if defined(MSDOS) -/* Standard startup code doesn't have room to load inherited environments - in some cases. Since they're not used, don't bother. (Using Microsoft - C compiler). */ -void _setenvp(void); -void _setenvp(){} -#endif - /* Write input file and line number for an error message */ void m_dumpline(file, line) M_WCHAR *file; @@ -92,9 +83,6 @@ for ( ; *p ; p++) } } -#if defined(MSDOS) -#include -#endif /* Write error message suffix */ void m_esuffix(void) { diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h b/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h index fed443896..65d32f1bd 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h @@ -35,11 +35,6 @@ #include #include -#if defined(MSDOS) -#include -#include -#include -#endif #include #if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) @@ -153,9 +148,6 @@ EXTERN LOGICAL filelist INIT(FALSE) ; /* NOTE: If driver is redimensioned, a change is needed in texinit() */ EXTERN char driver[20] -#if defined(MSDOS) - INIT("CDS") -#else #if defined(hpux) INIT("HPUX") #endif @@ -167,7 +159,6 @@ EXTERN char driver[20] #endif #if defined(sun) INIT("SUN") -#endif #endif ; @@ -191,14 +182,10 @@ struct search { EXTERN SEARCH *path INIT(NULL) ; EXTERN SEARCH **endpath INIT(&path) ; EXTERN char dirsep -#if defined(MSDOS) -INIT('\\') -#else #if defined(hpux) || defined(_AIX) || defined(sun) INIT('/') #else ****define directory separator here**** -#endif #endif ; @@ -206,13 +193,8 @@ INIT('/') #define CSEP '/' #define SSEP "/" #else -#if defined(MSDOS) -#define CSEP '\\' -#define SSEP "\\" -#else ****define directory separator here**** #endif -#endif /* Location in .TEX file of two \wlog messages */ EXTERN long wlog ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c index e3b2c77c1..981fa80ba 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c @@ -139,18 +139,6 @@ void basename(void) ) filelist = TRUE; /* Get installation directory */ -#if defined(MSDOS) - for (p = m_argv[0]; *p ; p++); - for (; ; p--) - if (*p == dirsep || *p == ':') break; - p++; - save = *p; - *p = M_EOS; - install = m_malloc(strlen(m_argv[0]) + 1, "installation directory"); - strcpy(install, m_argv[0]); - *p = save; - -#else #if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) #define CONTRIB "/usr/hphelp/bin/" @@ -230,16 +218,12 @@ void basename(void) #else Get installation directory -#endif #endif /* Set default working directory (from input filename) */ for (p = strchr(m_argv[1], M_EOS); p > m_argv[1] ; p--) - if (*(p - 1) == dirsep -#if defined(MSDOS) - || *(p - 1) == ':' -#endif - ) break; + if (*(p - 1) == dirsep) + break; if (p > m_argv[1]) { save = *p; *p = M_EOS; @@ -2213,18 +2197,11 @@ while (name = m_cyclent(init, &type, &content, &wheredef)) } } -#if defined(MSDOS) -m_openchk(&nullfile, "NUL", "w"); -#else #if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) m_openchk(&nullfile, "/dev/null", "w"); #else m_openchk(&nullfile, "nullfile", "w"); #endif -#endif -#if defined(MSDOS) -#else -#endif idxupdate = ftell(outfile); diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.if b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.if index 5e3ad6aab..4919b94e3 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.if +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.if @@ -172,9 +172,6 @@ <\CODE> -#if defined(MSDOS) - m_piaction("VECTRA", "m-machine", M_SDATA) ; -#else #if defined(hpux) { M_WCHAR *wc_1, *wc_2; @@ -213,7 +210,6 @@ M_SDATA) ; #endif #endif -#endif #endif <\CODE> diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/make.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/make.c index 8a4fb052b..b53a1647c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/make.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/make.c @@ -31,11 +31,6 @@ or invoke function pointers should be in tex.c. */ -#if defined(MSDOS) -#include -#include -#endif - #if defined(hpux) || defined(_AIX) || defined(sun) #include #include diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c index 3a5d65adc..f16728e84 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c @@ -294,11 +294,7 @@ if (! *string) switch (thisopt) { case SEARCHKEY: - if ( (parentsrch==TRUE) && (*string!=M_EOS) && (*string!=dirsep) -#if defined(MSDOS) - && ( *(string+1) != ':' ) -#endif - ) + if ( (parentsrch==TRUE) && (*string!=M_EOS) && (*string!=dirsep) ) { /* prepend "..", for index processing in temporary sub-directory */ tempstr = (char *) m_malloc( strlen(string) + 4, "tempstr search"); @@ -314,11 +310,7 @@ switch (thisopt) *endpath = (SEARCH *) m_malloc(sizeof(SEARCH), "search path"); p = strchr(tempstr, M_EOS); - if (p != tempstr && *(p - 1) != dirsep - #if defined(MSDOS) - && *(p - 1) != ':' - #endif - ) + if (p != tempstr && *(p - 1) != dirsep) { i = strlen(tempstr); (*endpath)->directory = (char *) m_malloc(i + 2, diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c index e6ea15291..e1a2240b2 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c @@ -32,9 +32,6 @@ in the interface definition.*/ #include #include -#if defined(MSDOS) -#include -#endif #include #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c b/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c index c974d7b5a..48757aa15 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "context.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c index ce5dba918..e05d6b440 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c b/cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c index ddcb99892..d6cdc38e5 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c @@ -27,9 +27,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(MSDOS) -#include -#endif /* Write error message suffix */ void m_esuffix(void) diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/exit.c b/cde/programs/dthelp/parser.ccdf/htag/parser/exit.c index 6383fcb95..d2e4d2056 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/exit.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/exit.c @@ -27,9 +27,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(MSDOS) -#include -#endif /* Default version of PARSER m_exit(). Allows interface control if internal error causes PARSER to halt. */ diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/minim.c b/cde/programs/dthelp/parser.ccdf/htag/parser/minim.c index 4bfcee79d..5742bc5a9 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/minim.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/minim.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c index 4eff40629..c5250a57a 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "delim.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c index 41e3f206a..b9f436866 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c @@ -33,9 +33,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c index 7b61380ab..d6ab9060d 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #define M_CONDEF diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c index 09dd0d035..a7de300b7 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c @@ -33,9 +33,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/context.c b/cde/programs/dthelp/parser.ccdf/htag/util/context.c index 9f3237d2f..1f92a699b 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/context.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/context.c @@ -157,9 +157,6 @@ delim.h. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c index fcee06cdf..e30308c12 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c b/cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c index dc56ffc0c..90493d922 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c @@ -24,9 +24,6 @@ /* Copyright (c) 1988, 1989 Hewlett-Packard Co. */ /* Creates a file with nothing in it */ #include -#if defined(MSDOS) -#include -#endif #include "basic.h" void main(int argc, char **argv) diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/exit.c b/cde/programs/dthelp/parser.ccdf/htag/util/exit.c index bc9a12c12..2fb2dc435 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/exit.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/exit.c @@ -25,9 +25,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. */ -#if defined(MSDOS) -#include -#endif #include "basic.h" void m_exit(int status); diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c b/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c index 7fc2aa147..77a4e8078 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c @@ -37,9 +37,6 @@ with an error code of 0 if the files are the same, 1 if they differ, and #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #define SAME 0 /* different defined to be 0 as of 12-1-89, because fclndir now does @@ -122,11 +119,7 @@ void copyfile(pfile1,pfile2) /* malloc space for the system command: two filenames, plus a command, spaces, and the terminating null */ pcmd = (char *) malloc(strlen(pfile1) + strlen(pfile2) + 8); -#if defined(MSDOS) - ret = sprintf(pcmd,"copy %s %s",pfile1,pfile2); -#else ret = sprintf(pcmd,"cp %s %s",pfile1,pfile2); -#endif ret = system(pcmd); ret = sprintf(pcmd,"touch %s",pfile2); ret = system(pcmd); diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/inctest.c b/cde/programs/dthelp/parser.ccdf/htag/util/inctest.c index 9f25e667e..f2dbba3ee 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/inctest.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/inctest.c @@ -25,9 +25,6 @@ Copyright 1986, 1987, 1988, 1989 Hewlett-Packard Co. */ -#if defined(MSDOS) -#include -#endif #include "basic.h" void m_err1(const char *text, const char *arg); diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c index 343d11225..7e99cd3bc 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c @@ -28,9 +28,6 @@ /**/ #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" extern LOGICAL m_heapchk ; @@ -58,9 +55,6 @@ void m_free(block, msg) { char buffer[32] ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (m_malftrace) { #if defined(hpux) || defined(_AIX) || defined(sun) sprintf(buffer, "%5x:%5x", @@ -75,46 +69,8 @@ void m_free(block, msg) m_trace("\n") ; } free(block) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif } -#if defined(MSDOS) -void m_heapdump(void) - { - struct _heapinfo hinfo ; - int heapstatus ; - - heapstatus = _heapchk() ; - if (heapstatus == _HEAPOK || heapstatus == _HEAPEMPTY) return ; - printf("\nDumping heap:\n") ; - hinfo._pentry = NULL ; - while ((heapstatus = _heapwalk(&hinfo)) == _HEAPOK) - printf("%6s block at %p of size %4.4X\n", - hinfo._useflag == _USEDENTRY ? "USED" : "FREE", - hinfo._pentry, hinfo._size) ; - switch(heapstatus) { - case _HEAPEMPTY: - printf("OK - empty heap\n\n") ; - break ; - case _HEAPEND: - printf("OK - end of heap\n\n") ; - break ; - case _HEAPBADPTR: - printf("Error - bad pointer to heap\n\n") ; - break ; - case _HEAPBADBEGIN: - printf("Error - bad start of heap\n\n") ; - break ; - case _HEAPBADNODE: - printf("Error - bad node in heap\n\n") ; - break ; - } - m_exit(TRUE) ; - } -#endif - void *m_malloc(size, msg) int size ; char *msg ; @@ -123,14 +79,8 @@ void *m_malloc(size, msg) void *p ; size *= sizeof(M_WCHAR); -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! size) return(NULL) ; p = (void *) malloc(size) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! p) { m_errline("Unable to allocate space for ") ; m_errline(msg) ; @@ -164,14 +114,8 @@ void *m_realloc(ptr, size, msg) void *p ; size *= sizeof(M_WCHAR); -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! size) return(NULL) ; p = (void *) realloc(ptr, size) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! p) { m_errline("Unable to re-allocate space for ") ; m_errline(msg) ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/openchk.c b/cde/programs/dthelp/parser.ccdf/htag/util/openchk.c index d5f4b4fc9..327b205db 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/openchk.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/openchk.c @@ -26,9 +26,6 @@ */ #include -#if defined(MSDOS) -#include -#endif #include "basic.h" extern FILE *m_errfile ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/trie.c b/cde/programs/dthelp/parser.ccdf/htag/util/trie.c index 67f790254..16ae146b7 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/trie.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/trie.c @@ -31,10 +31,6 @@ #include -#if defined(MSDOS) -#include -#endif - #include "basic.h" #include "common.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/canon1/build/build.c b/cde/programs/dthelp/parser/canon1/build/build.c index 4fe65690a..f13e2927a 100644 --- a/cde/programs/dthelp/parser/canon1/build/build.c +++ b/cde/programs/dthelp/parser/canon1/build/build.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "context.h" #define BUILDEF #include "build.h" diff --git a/cde/programs/dthelp/parser/canon1/build/out.c b/cde/programs/dthelp/parser/canon1/build/out.c index 5c7dc63c5..28c664cc5 100644 --- a/cde/programs/dthelp/parser/canon1/build/out.c +++ b/cde/programs/dthelp/parser/canon1/build/out.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "context.h" #include "build.h" #include "delim.h" diff --git a/cde/programs/dthelp/parser/canon1/build/scan.c b/cde/programs/dthelp/parser/canon1/build/scan.c index aa8046405..071f3238a 100644 --- a/cde/programs/dthelp/parser/canon1/build/scan.c +++ b/cde/programs/dthelp/parser/canon1/build/scan.c @@ -30,9 +30,6 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Scan.c contains scanner procedures for program BUILD */ #include -#if defined(MSDOS) -#include -#endif #include "build.h" #define M_CONDEF #include "context.h" diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c b/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c index 45540d03d..e8f34f390 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c +++ b/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c index 266b02330..ee96a26c9 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/canon1/eltdef/scan.c b/cde/programs/dthelp/parser/canon1/eltdef/scan.c index 3317a955b..d4f8e5815 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/scan.c +++ b/cde/programs/dthelp/parser/canon1/eltdef/scan.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/canon1/helptag/custom.c b/cde/programs/dthelp/parser/canon1/helptag/custom.c index 27df40ade..ac501530d 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/custom.c +++ b/cde/programs/dthelp/parser/canon1/helptag/custom.c @@ -32,15 +32,6 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co. #include "globdec.h" #include - -#if defined(MSDOS) -/* Standard startup code doesn't have room to load inherited environments - in some cases. Since they're not used, don't bother. (Using Microsoft - C compiler). */ -void _setenvp(void); -void _setenvp(){} -#endif - /* Write input file and line number for an error message */ void m_dumpline(file, line) M_WCHAR *file; @@ -92,9 +83,6 @@ for ( ; *p ; p++) } } -#if defined(MSDOS) -#include -#endif /* Write error message suffix */ void m_esuffix(void) { diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.h b/cde/programs/dthelp/parser/canon1/helptag/global.h index e45c04650..4b1335220 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/global.h +++ b/cde/programs/dthelp/parser/canon1/helptag/global.h @@ -36,11 +36,6 @@ #include #include #include -#if defined(MSDOS) -#include -#include -#include -#endif #include #if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) @@ -175,14 +170,10 @@ struct search { EXTERN SEARCH *path INIT(NULL) ; EXTERN SEARCH **endpath INIT(&path) ; EXTERN char dirsep -#if defined(MSDOS) -INIT('\\') -#else #if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) INIT('/') #else ****define directory separator here**** -#endif #endif ; @@ -190,13 +181,8 @@ INIT('/') #define CSEP '/' #define SSEP "/" #else -#if defined(MSDOS) -#define CSEP '\\' -#define SSEP "\\" -#else ****define directory separator here**** #endif -#endif /* Location in .TEX file of two \wlog messages */ EXTERN long wlog ; diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.if b/cde/programs/dthelp/parser/canon1/helptag/help.if index 2ea2cf035..6c856cfb7 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.if +++ b/cde/programs/dthelp/parser/canon1/helptag/help.if @@ -144,9 +144,6 @@ -#if defined(MSDOS) - m_piaction("VECTRA", "m-machine", M_SDATA) ; -#else #if defined(hpux) { M_WCHAR *wc_1, *wc_2; @@ -185,7 +182,6 @@ M_SDATA) ; #endif #endif -#endif #endif diff --git a/cde/programs/dthelp/parser/canon1/helptag/make.c b/cde/programs/dthelp/parser/canon1/helptag/make.c index dd5d7f7e9..5c6ab8ef0 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/make.c +++ b/cde/programs/dthelp/parser/canon1/helptag/make.c @@ -31,11 +31,6 @@ or invoke function pointers should be in tex.c. */ -#if defined(MSDOS) -#include -#include -#endif - #if defined(hpux) || defined(_AIX) || defined(sun) #include #include diff --git a/cde/programs/dthelp/parser/canon1/helptag/option.c b/cde/programs/dthelp/parser/canon1/helptag/option.c index 006384284..db47515f5 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/option.c +++ b/cde/programs/dthelp/parser/canon1/helptag/option.c @@ -294,11 +294,7 @@ if (! *string) switch (thisopt) { case SEARCHKEY: - if ( (parentsrch==TRUE) && (*string!=M_EOS) && (*string!=dirsep) -#if defined(MSDOS) - && ( *(string+1) != ':' ) -#endif - ) + if ( (parentsrch==TRUE) && (*string!=M_EOS) && (*string!=dirsep) ) { /* prepend "..", for index processing in temporary sub-directory */ tempstr = (char *) m_malloc( strlen(string) + 4, "tempstr search"); @@ -314,11 +310,7 @@ switch (thisopt) *endpath = (SEARCH *) m_malloc(sizeof(SEARCH), "search path"); p = strchr(tempstr, M_EOS); - if (p != tempstr && *(p - 1) != dirsep - #if defined(MSDOS) - && *(p - 1) != ':' - #endif - ) + if (p != tempstr && *(p - 1) != dirsep) { i = strlen(tempstr); (*endpath)->directory = (char *) m_malloc(i + 2, diff --git a/cde/programs/dthelp/parser/canon1/parser/actutil.c b/cde/programs/dthelp/parser/canon1/parser/actutil.c index 28fabb844..7e4495d50 100644 --- a/cde/programs/dthelp/parser/canon1/parser/actutil.c +++ b/cde/programs/dthelp/parser/canon1/parser/actutil.c @@ -32,9 +32,6 @@ in the interface definition.*/ #include #include -#if defined(MSDOS) -#include -#endif #include #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/canon1/parser/entity.c b/cde/programs/dthelp/parser/canon1/parser/entity.c index 6ace9b34b..f27cf0e71 100644 --- a/cde/programs/dthelp/parser/canon1/parser/entity.c +++ b/cde/programs/dthelp/parser/canon1/parser/entity.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "context.h" diff --git a/cde/programs/dthelp/parser/canon1/parser/error.c b/cde/programs/dthelp/parser/canon1/parser/error.c index 9857cdba8..e83303c2d 100644 --- a/cde/programs/dthelp/parser/canon1/parser/error.c +++ b/cde/programs/dthelp/parser/canon1/parser/error.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/canon1/parser/esuffix.c b/cde/programs/dthelp/parser/canon1/parser/esuffix.c index 6d5d513f8..31b12d8a1 100644 --- a/cde/programs/dthelp/parser/canon1/parser/esuffix.c +++ b/cde/programs/dthelp/parser/canon1/parser/esuffix.c @@ -27,9 +27,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(MSDOS) -#include -#endif /* Write error message suffix */ void m_esuffix(void) diff --git a/cde/programs/dthelp/parser/canon1/parser/exit.c b/cde/programs/dthelp/parser/canon1/parser/exit.c index be276f5ff..67952a960 100644 --- a/cde/programs/dthelp/parser/canon1/parser/exit.c +++ b/cde/programs/dthelp/parser/canon1/parser/exit.c @@ -27,9 +27,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(MSDOS) -#include -#endif /* Default version of PARSER m_exit(). Allows interface control if internal error causes PARSER to halt. */ diff --git a/cde/programs/dthelp/parser/canon1/parser/minim.c b/cde/programs/dthelp/parser/canon1/parser/minim.c index fffe1fe6c..c18ceb1ea 100644 --- a/cde/programs/dthelp/parser/canon1/parser/minim.c +++ b/cde/programs/dthelp/parser/canon1/parser/minim.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/canon1/parser/param.c b/cde/programs/dthelp/parser/canon1/parser/param.c index 98446638a..bec0a121d 100644 --- a/cde/programs/dthelp/parser/canon1/parser/param.c +++ b/cde/programs/dthelp/parser/canon1/parser/param.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "delim.h" diff --git a/cde/programs/dthelp/parser/canon1/parser/parutil.c b/cde/programs/dthelp/parser/canon1/parser/parutil.c index 58f991ed3..2c321ac9c 100644 --- a/cde/programs/dthelp/parser/canon1/parser/parutil.c +++ b/cde/programs/dthelp/parser/canon1/parser/parutil.c @@ -33,9 +33,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/canon1/parser/scan.c b/cde/programs/dthelp/parser/canon1/parser/scan.c index 2426e65ca..0d2bc240e 100644 --- a/cde/programs/dthelp/parser/canon1/parser/scan.c +++ b/cde/programs/dthelp/parser/canon1/parser/scan.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #define M_CONDEF diff --git a/cde/programs/dthelp/parser/canon1/parser/struct.c b/cde/programs/dthelp/parser/canon1/parser/struct.c index 3130929b1..1b4e526c9 100644 --- a/cde/programs/dthelp/parser/canon1/parser/struct.c +++ b/cde/programs/dthelp/parser/canon1/parser/struct.c @@ -33,9 +33,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/canon1/util/context.c b/cde/programs/dthelp/parser/canon1/util/context.c index 5cc87cbec..3e9140306 100644 --- a/cde/programs/dthelp/parser/canon1/util/context.c +++ b/cde/programs/dthelp/parser/canon1/util/context.c @@ -157,9 +157,6 @@ delim.h. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/canon1/util/conutil.c b/cde/programs/dthelp/parser/canon1/util/conutil.c index a6ab7a024..375923e86 100644 --- a/cde/programs/dthelp/parser/canon1/util/conutil.c +++ b/cde/programs/dthelp/parser/canon1/util/conutil.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/canon1/util/emptyfil.c b/cde/programs/dthelp/parser/canon1/util/emptyfil.c index 3672bd085..a3bdc5719 100644 --- a/cde/programs/dthelp/parser/canon1/util/emptyfil.c +++ b/cde/programs/dthelp/parser/canon1/util/emptyfil.c @@ -24,9 +24,6 @@ /* Copyright (c) 1988, 1989 Hewlett-Packard Co. */ /* Creates a file with nothing in it */ #include -#if defined(MSDOS) -#include -#endif #include "basic.h" void main(int argc, char **argv); diff --git a/cde/programs/dthelp/parser/canon1/util/exit.c b/cde/programs/dthelp/parser/canon1/util/exit.c index 96ec73e5b..3991b6180 100644 --- a/cde/programs/dthelp/parser/canon1/util/exit.c +++ b/cde/programs/dthelp/parser/canon1/util/exit.c @@ -25,9 +25,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. */ -#if defined(MSDOS) -#include -#endif #include "basic.h" void m_exit(int status); diff --git a/cde/programs/dthelp/parser/canon1/util/fclndir.c b/cde/programs/dthelp/parser/canon1/util/fclndir.c index 141592714..283befe3a 100644 --- a/cde/programs/dthelp/parser/canon1/util/fclndir.c +++ b/cde/programs/dthelp/parser/canon1/util/fclndir.c @@ -37,9 +37,6 @@ with an error code of 0 if the files are the same, 1 if they differ, and #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #define SAME 0 /* different defined to be 0 as of 12-1-89, because fclndir now does @@ -124,11 +121,7 @@ void copyfile(pfile1,pfile2) spaces, and the terminating null */ slen = strlen(pfile1) + strlen(pfile2) + 8; pcmd = (char *) malloc(slen); -#if defined(MSDOS) - ret = snprintf(pcmd, slen, "copy %s %s",pfile1,pfile2); -#else ret = snprintf(pcmd, slen, "cp %s %s",pfile1,pfile2); -#endif ret = system(pcmd); ret = snprintf(pcmd, slen, "touch %s",pfile2); ret = system(pcmd); diff --git a/cde/programs/dthelp/parser/canon1/util/inctest.c b/cde/programs/dthelp/parser/canon1/util/inctest.c index aca54d1af..096797157 100644 --- a/cde/programs/dthelp/parser/canon1/util/inctest.c +++ b/cde/programs/dthelp/parser/canon1/util/inctest.c @@ -25,9 +25,6 @@ Copyright 1986, 1987, 1988, 1989 Hewlett-Packard Co. */ -#if defined(MSDOS) -#include -#endif #include "basic.h" void m_err1(const char *text, const char *arg); diff --git a/cde/programs/dthelp/parser/canon1/util/malloc.c b/cde/programs/dthelp/parser/canon1/util/malloc.c index 06800d850..04d28343e 100644 --- a/cde/programs/dthelp/parser/canon1/util/malloc.c +++ b/cde/programs/dthelp/parser/canon1/util/malloc.c @@ -28,9 +28,6 @@ /**/ #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" extern LOGICAL m_heapchk ; @@ -58,9 +55,6 @@ void m_free(block, msg) { char buffer[32] ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif free(block) ; if (m_malftrace) { #if defined(hpux) || defined(_AIX) || defined(sun) @@ -75,46 +69,8 @@ void m_free(block, msg) m_trace(msg) ; m_trace("\n") ; } -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif } -#if defined(MSDOS) -void m_heapdump(void) - { - struct _heapinfo hinfo ; - int heapstatus ; - - heapstatus = _heapchk() ; - if (heapstatus == _HEAPOK || heapstatus == _HEAPEMPTY) return ; - printf("\nDumping heap:\n") ; - hinfo._pentry = NULL ; - while ((heapstatus = _heapwalk(&hinfo)) == _HEAPOK) - printf("%6s block at %p of size %4.4X\n", - hinfo._useflag == _USEDENTRY ? "USED" : "FREE", - hinfo._pentry, hinfo._size) ; - switch(heapstatus) { - case _HEAPEMPTY: - printf("OK - empty heap\n\n") ; - break ; - case _HEAPEND: - printf("OK - end of heap\n\n") ; - break ; - case _HEAPBADPTR: - printf("Error - bad pointer to heap\n\n") ; - break ; - case _HEAPBADBEGIN: - printf("Error - bad start of heap\n\n") ; - break ; - case _HEAPBADNODE: - printf("Error - bad node in heap\n\n") ; - break ; - } - m_exit(TRUE) ; - } -#endif - void *m_malloc(size, msg) int size ; char *msg ; @@ -123,14 +79,8 @@ void *m_malloc(size, msg) void *p ; size *= sizeof(M_WCHAR); -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! size) return(NULL) ; p = (void *) malloc(size) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! p) { m_errline("Unable to allocate space for ") ; m_errline(msg) ; @@ -164,14 +114,8 @@ void *m_realloc(ptr, size, msg) void *p ; size *= sizeof(M_WCHAR); -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! size) return(NULL) ; p = (void *) realloc(ptr, size) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! p) { m_errline("Unable to re-allocate space for ") ; m_errline(msg) ; diff --git a/cde/programs/dthelp/parser/canon1/util/openchk.c b/cde/programs/dthelp/parser/canon1/util/openchk.c index 2059c7c04..dabc4bc3b 100644 --- a/cde/programs/dthelp/parser/canon1/util/openchk.c +++ b/cde/programs/dthelp/parser/canon1/util/openchk.c @@ -26,9 +26,6 @@ */ #include -#if defined(MSDOS) -#include -#endif #include "basic.h" extern FILE *m_errfile ; diff --git a/cde/programs/dthelp/parser/canon1/util/trie.c b/cde/programs/dthelp/parser/canon1/util/trie.c index d32958ec4..dc43f4f1a 100644 --- a/cde/programs/dthelp/parser/canon1/util/trie.c +++ b/cde/programs/dthelp/parser/canon1/util/trie.c @@ -31,10 +31,6 @@ #include -#if defined(MSDOS) -#include -#endif - #include "basic.h" #include "common.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass1/build/build.c b/cde/programs/dthelp/parser/pass1/build/build.c index 0bca5ab35..f908e5b1e 100644 --- a/cde/programs/dthelp/parser/pass1/build/build.c +++ b/cde/programs/dthelp/parser/pass1/build/build.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "context.h" #define BUILDEF #include "build.h" diff --git a/cde/programs/dthelp/parser/pass1/build/out.c b/cde/programs/dthelp/parser/pass1/build/out.c index 4db1d5847..1a4e8f0a4 100644 --- a/cde/programs/dthelp/parser/pass1/build/out.c +++ b/cde/programs/dthelp/parser/pass1/build/out.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "context.h" #include "build.h" #include "delim.h" diff --git a/cde/programs/dthelp/parser/pass1/build/scan.c b/cde/programs/dthelp/parser/pass1/build/scan.c index 7826aa8c0..895c18a1a 100644 --- a/cde/programs/dthelp/parser/pass1/build/scan.c +++ b/cde/programs/dthelp/parser/pass1/build/scan.c @@ -30,9 +30,6 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Scan.c contains scanner procedures for program BUILD */ #include -#if defined(MSDOS) -#include -#endif #include "build.h" #define M_CONDEF #include "context.h" diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c b/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c index cd27ab0d3..a1af1f181 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c +++ b/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c index e4faf649d..9e958bcc9 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass1/eltdef/scan.c b/cde/programs/dthelp/parser/pass1/eltdef/scan.c index d0cda0bbc..811cecd32 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/scan.c +++ b/cde/programs/dthelp/parser/pass1/eltdef/scan.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass1/helptag/custom.c b/cde/programs/dthelp/parser/pass1/helptag/custom.c index 9da131fc7..68412bbd3 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/custom.c +++ b/cde/programs/dthelp/parser/pass1/helptag/custom.c @@ -32,15 +32,6 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co. #include "globdec.h" #include - -#if defined(MSDOS) -/* Standard startup code doesn't have room to load inherited environments - in some cases. Since they're not used, don't bother. (Using Microsoft - C compiler). */ -void _setenvp(void); -void _setenvp(){} -#endif - /* Write input file and line number for an error message */ void m_dumpline(file, line) M_WCHAR *file; @@ -92,9 +83,6 @@ for ( ; *p ; p++) } } -#if defined(MSDOS) -#include -#endif /* Write error message suffix */ void m_esuffix(void) { diff --git a/cde/programs/dthelp/parser/pass1/helptag/global.h b/cde/programs/dthelp/parser/pass1/helptag/global.h index 490cd6268..d3b8d2015 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/global.h +++ b/cde/programs/dthelp/parser/pass1/helptag/global.h @@ -36,11 +36,6 @@ #include #include #include -#if defined(MSDOS) -#include -#include -#include -#endif #include #include diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.if b/cde/programs/dthelp/parser/pass1/helptag/help.if index d5b487305..aa43e0ccb 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.if +++ b/cde/programs/dthelp/parser/pass1/helptag/help.if @@ -133,9 +133,6 @@ <\CODE> -#if defined(MSDOS) - m_piaction("VECTRA", "m-machine", M_SDATA) ; -#else #if defined(hpux) { M_WCHAR *wc_1, *wc_2; @@ -174,7 +171,6 @@ M_SDATA) ; #endif #endif -#endif #endif <\CODE> diff --git a/cde/programs/dthelp/parser/pass1/helptag/make.c b/cde/programs/dthelp/parser/pass1/helptag/make.c index e74a56e47..7dfe88931 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/make.c +++ b/cde/programs/dthelp/parser/pass1/helptag/make.c @@ -31,11 +31,6 @@ or invoke function pointers should be in tex.c. */ -#if defined(MSDOS) -#include -#include -#endif - #if defined(hpux) || defined(_AIX) || defined(sun) #include #include diff --git a/cde/programs/dthelp/parser/pass1/parser/actutil.c b/cde/programs/dthelp/parser/pass1/parser/actutil.c index 0d6894d71..2d5ee736b 100644 --- a/cde/programs/dthelp/parser/pass1/parser/actutil.c +++ b/cde/programs/dthelp/parser/pass1/parser/actutil.c @@ -32,9 +32,6 @@ in the interface definition.*/ #include #include -#if defined(MSDOS) -#include -#endif #include #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass1/parser/entity.c b/cde/programs/dthelp/parser/pass1/parser/entity.c index 89390b016..c81b35f01 100644 --- a/cde/programs/dthelp/parser/pass1/parser/entity.c +++ b/cde/programs/dthelp/parser/pass1/parser/entity.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "context.h" diff --git a/cde/programs/dthelp/parser/pass1/parser/error.c b/cde/programs/dthelp/parser/pass1/parser/error.c index bbea85ead..c93defc5e 100644 --- a/cde/programs/dthelp/parser/pass1/parser/error.c +++ b/cde/programs/dthelp/parser/pass1/parser/error.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/pass1/parser/esuffix.c b/cde/programs/dthelp/parser/pass1/parser/esuffix.c index 6bcf0a6f9..b56151199 100644 --- a/cde/programs/dthelp/parser/pass1/parser/esuffix.c +++ b/cde/programs/dthelp/parser/pass1/parser/esuffix.c @@ -27,9 +27,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(MSDOS) -#include -#endif /* Write error message suffix */ void m_esuffix(void) diff --git a/cde/programs/dthelp/parser/pass1/parser/exit.c b/cde/programs/dthelp/parser/pass1/parser/exit.c index 49bed3fd3..e6fe99003 100644 --- a/cde/programs/dthelp/parser/pass1/parser/exit.c +++ b/cde/programs/dthelp/parser/pass1/parser/exit.c @@ -27,9 +27,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(MSDOS) -#include -#endif /* Default version of PARSER m_exit(). Allows interface control if internal error causes PARSER to halt. */ diff --git a/cde/programs/dthelp/parser/pass1/parser/minim.c b/cde/programs/dthelp/parser/pass1/parser/minim.c index 2a7c5c689..2405dcf4b 100644 --- a/cde/programs/dthelp/parser/pass1/parser/minim.c +++ b/cde/programs/dthelp/parser/pass1/parser/minim.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/pass1/parser/param.c b/cde/programs/dthelp/parser/pass1/parser/param.c index 579c6e4bf..be6a493d5 100644 --- a/cde/programs/dthelp/parser/pass1/parser/param.c +++ b/cde/programs/dthelp/parser/pass1/parser/param.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "delim.h" diff --git a/cde/programs/dthelp/parser/pass1/parser/parutil.c b/cde/programs/dthelp/parser/pass1/parser/parutil.c index 48e65b68e..d388d0837 100644 --- a/cde/programs/dthelp/parser/pass1/parser/parutil.c +++ b/cde/programs/dthelp/parser/pass1/parser/parutil.c @@ -33,9 +33,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/pass1/parser/scan.c b/cde/programs/dthelp/parser/pass1/parser/scan.c index e289b3808..0e9c8fe13 100644 --- a/cde/programs/dthelp/parser/pass1/parser/scan.c +++ b/cde/programs/dthelp/parser/pass1/parser/scan.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #define M_CONDEF diff --git a/cde/programs/dthelp/parser/pass1/parser/struct.c b/cde/programs/dthelp/parser/pass1/parser/struct.c index bff0065f2..c261567c4 100644 --- a/cde/programs/dthelp/parser/pass1/parser/struct.c +++ b/cde/programs/dthelp/parser/pass1/parser/struct.c @@ -33,9 +33,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/pass1/util/context.c b/cde/programs/dthelp/parser/pass1/util/context.c index 39370a370..3d13a5025 100644 --- a/cde/programs/dthelp/parser/pass1/util/context.c +++ b/cde/programs/dthelp/parser/pass1/util/context.c @@ -158,9 +158,6 @@ delim.h. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass1/util/conutil.c b/cde/programs/dthelp/parser/pass1/util/conutil.c index b9694a2af..d83aa0a88 100644 --- a/cde/programs/dthelp/parser/pass1/util/conutil.c +++ b/cde/programs/dthelp/parser/pass1/util/conutil.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass1/util/emptyfil.c b/cde/programs/dthelp/parser/pass1/util/emptyfil.c index 1efb397a7..5569cbe30 100644 --- a/cde/programs/dthelp/parser/pass1/util/emptyfil.c +++ b/cde/programs/dthelp/parser/pass1/util/emptyfil.c @@ -24,12 +24,9 @@ /* Copyright (c) 1988, 1989 Hewlett-Packard Co. */ /* Creates a file with nothing in it */ #include -#if defined(MSDOS) -#include -#endif #include "basic.h" -void main(int argc, char **argv) +int main(int argc, char **argv) { if (argc != 2) { fprintf(stderr, "Usage: emptyfil filename\n") ; diff --git a/cde/programs/dthelp/parser/pass1/util/exit.c b/cde/programs/dthelp/parser/pass1/util/exit.c index 04506ec5a..541a6590b 100644 --- a/cde/programs/dthelp/parser/pass1/util/exit.c +++ b/cde/programs/dthelp/parser/pass1/util/exit.c @@ -25,9 +25,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. */ -#if defined(MSDOS) -#include -#endif #include "basic.h" void m_exit(int status); diff --git a/cde/programs/dthelp/parser/pass1/util/fclndir.c b/cde/programs/dthelp/parser/pass1/util/fclndir.c index 58d2c8498..e7c0005e8 100644 --- a/cde/programs/dthelp/parser/pass1/util/fclndir.c +++ b/cde/programs/dthelp/parser/pass1/util/fclndir.c @@ -37,9 +37,6 @@ with an error code of 0 if the files are the same, 1 if they differ, and #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #define SAME 0 /* different defined to be 0 as of 12-1-89, because fclndir now does @@ -124,11 +121,7 @@ void copyfile(pfile1,pfile2) spaces, and the terminating null */ slen = strlen(pfile1) + strlen(pfile2) + 8; pcmd = (char *) malloc(slen); -#if defined(MSDOS) - ret = snprintf(pcmd, slen, "copy %s %s",pfile1,pfile2); -#else ret = snprintf(pcmd, slen, "cp %s %s",pfile1,pfile2); -#endif ret = system(pcmd); ret = snprintf(pcmd, slen, "touch %s",pfile2); ret = system(pcmd); diff --git a/cde/programs/dthelp/parser/pass1/util/inctest.c b/cde/programs/dthelp/parser/pass1/util/inctest.c index ee462a27d..ac45e68be 100644 --- a/cde/programs/dthelp/parser/pass1/util/inctest.c +++ b/cde/programs/dthelp/parser/pass1/util/inctest.c @@ -25,9 +25,6 @@ Copyright 1986, 1987, 1988, 1989 Hewlett-Packard Co. */ -#if defined(MSDOS) -#include -#endif #include "basic.h" void m_err1(const char *text, const char *arg); diff --git a/cde/programs/dthelp/parser/pass1/util/malloc.c b/cde/programs/dthelp/parser/pass1/util/malloc.c index 111e9a865..1d036af2a 100644 --- a/cde/programs/dthelp/parser/pass1/util/malloc.c +++ b/cde/programs/dthelp/parser/pass1/util/malloc.c @@ -28,9 +28,6 @@ /**/ #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" extern LOGICAL m_heapchk ; @@ -58,9 +55,6 @@ void m_free(block, msg) { char buffer[32] ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (m_malftrace) { #if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", @@ -75,46 +69,8 @@ void m_free(block, msg) m_trace("\n") ; } free(block) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif } -#if defined(MSDOS) -void m_heapdump(void) - { - struct _heapinfo hinfo ; - int heapstatus ; - - heapstatus = _heapchk() ; - if (heapstatus == _HEAPOK || heapstatus == _HEAPEMPTY) return ; - printf("\nDumping heap:\n") ; - hinfo._pentry = NULL ; - while ((heapstatus = _heapwalk(&hinfo)) == _HEAPOK) - printf("%6s block at %p of size %4.4X\n", - hinfo._useflag == _USEDENTRY ? "USED" : "FREE", - hinfo._pentry, hinfo._size) ; - switch(heapstatus) { - case _HEAPEMPTY: - printf("OK - empty heap\n\n") ; - break ; - case _HEAPEND: - printf("OK - end of heap\n\n") ; - break ; - case _HEAPBADPTR: - printf("Error - bad pointer to heap\n\n") ; - break ; - case _HEAPBADBEGIN: - printf("Error - bad start of heap\n\n") ; - break ; - case _HEAPBADNODE: - printf("Error - bad node in heap\n\n") ; - break ; - } - m_exit(TRUE) ; - } -#endif - void *m_malloc(size, msg) int size ; char *msg ; @@ -123,14 +79,8 @@ void *m_malloc(size, msg) void *p ; size *= sizeof(M_WCHAR); -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! size) return(NULL) ; p = (void *) malloc(size) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! p) { m_errline("Unable to allocate space for ") ; m_errline(msg) ; @@ -164,14 +114,8 @@ void *m_realloc(ptr, size, msg) void *p ; size *= sizeof(M_WCHAR); -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! size) return(NULL) ; p = (void *) realloc(ptr, size) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! p) { m_errline("Unable to re-allocate space for ") ; m_errline(msg) ; diff --git a/cde/programs/dthelp/parser/pass1/util/openchk.c b/cde/programs/dthelp/parser/pass1/util/openchk.c index 4020434c4..ecf3ab402 100644 --- a/cde/programs/dthelp/parser/pass1/util/openchk.c +++ b/cde/programs/dthelp/parser/pass1/util/openchk.c @@ -26,9 +26,6 @@ */ #include -#if defined(MSDOS) -#include -#endif #include "basic.h" extern FILE *m_errfile ; diff --git a/cde/programs/dthelp/parser/pass1/util/trie.c b/cde/programs/dthelp/parser/pass1/util/trie.c index 500647ed8..81300d5be 100644 --- a/cde/programs/dthelp/parser/pass1/util/trie.c +++ b/cde/programs/dthelp/parser/pass1/util/trie.c @@ -31,10 +31,6 @@ #include -#if defined(MSDOS) -#include -#endif - #include "basic.h" #include "common.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass2/build/build.c b/cde/programs/dthelp/parser/pass2/build/build.c index 51ea7d7ce..a44fb2975 100644 --- a/cde/programs/dthelp/parser/pass2/build/build.c +++ b/cde/programs/dthelp/parser/pass2/build/build.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "context.h" #define BUILDEF #include "build.h" diff --git a/cde/programs/dthelp/parser/pass2/build/out.c b/cde/programs/dthelp/parser/pass2/build/out.c index db2291a10..a051387f3 100644 --- a/cde/programs/dthelp/parser/pass2/build/out.c +++ b/cde/programs/dthelp/parser/pass2/build/out.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "context.h" #include "build.h" #include "delim.h" diff --git a/cde/programs/dthelp/parser/pass2/build/scan.c b/cde/programs/dthelp/parser/pass2/build/scan.c index 6412c9bf6..c6838ebb1 100644 --- a/cde/programs/dthelp/parser/pass2/build/scan.c +++ b/cde/programs/dthelp/parser/pass2/build/scan.c @@ -30,9 +30,6 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Scan.c contains scanner procedures for program BUILD */ #include -#if defined(MSDOS) -#include -#endif #include "build.h" #define M_CONDEF #include "context.h" diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c b/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c index f1858e140..f59e58012 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c +++ b/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c index acfd50d79..3a63e5c73 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass2/eltdef/scan.c b/cde/programs/dthelp/parser/pass2/eltdef/scan.c index 3c4d91984..a32a268a1 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/scan.c +++ b/cde/programs/dthelp/parser/pass2/eltdef/scan.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass2/htag2/custom.c b/cde/programs/dthelp/parser/pass2/htag2/custom.c index 7869d97ac..68ff59661 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/custom.c +++ b/cde/programs/dthelp/parser/pass2/htag2/custom.c @@ -32,15 +32,6 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co. #include "globdec.h" #include - -#if defined(MSDOS) -/* Standard startup code doesn't have room to load inherited environments - in some cases. Since they're not used, don't bother. (Using Microsoft - C compiler). */ -void _setenvp(void); -void _setenvp(){} -#endif - /* Write input file and line number for an error message */ void m_dumpline(file, line) M_WCHAR *file; @@ -90,9 +81,6 @@ for ( ; *p ; p++) } } -#if defined(MSDOS) -#include -#endif /* Write error message suffix */ void m_esuffix(void) { diff --git a/cde/programs/dthelp/parser/pass2/htag2/global.h b/cde/programs/dthelp/parser/pass2/htag2/global.h index 8630de937..e983ad9b3 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/global.h +++ b/cde/programs/dthelp/parser/pass2/htag2/global.h @@ -36,11 +36,6 @@ #include #include #include -#if defined(MSDOS) -#include -#include -#include -#endif #include #if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) diff --git a/cde/programs/dthelp/parser/pass2/parser/actutil.c b/cde/programs/dthelp/parser/pass2/parser/actutil.c index 84d44c16f..59e084ead 100644 --- a/cde/programs/dthelp/parser/pass2/parser/actutil.c +++ b/cde/programs/dthelp/parser/pass2/parser/actutil.c @@ -32,9 +32,6 @@ in the interface definition.*/ #include #include -#if defined(MSDOS) -#include -#endif #include #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass2/parser/entity.c b/cde/programs/dthelp/parser/pass2/parser/entity.c index 8ff69c507..703f39fff 100644 --- a/cde/programs/dthelp/parser/pass2/parser/entity.c +++ b/cde/programs/dthelp/parser/pass2/parser/entity.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "context.h" diff --git a/cde/programs/dthelp/parser/pass2/parser/error.c b/cde/programs/dthelp/parser/pass2/parser/error.c index 3331b829b..7f6b9ab51 100644 --- a/cde/programs/dthelp/parser/pass2/parser/error.c +++ b/cde/programs/dthelp/parser/pass2/parser/error.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/pass2/parser/esuffix.c b/cde/programs/dthelp/parser/pass2/parser/esuffix.c index 98e245b86..9b71a516e 100644 --- a/cde/programs/dthelp/parser/pass2/parser/esuffix.c +++ b/cde/programs/dthelp/parser/pass2/parser/esuffix.c @@ -27,9 +27,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(MSDOS) -#include -#endif /* Write error message suffix */ void m_esuffix(void) diff --git a/cde/programs/dthelp/parser/pass2/parser/exit.c b/cde/programs/dthelp/parser/pass2/parser/exit.c index 532097e0a..215dc6d98 100644 --- a/cde/programs/dthelp/parser/pass2/parser/exit.c +++ b/cde/programs/dthelp/parser/pass2/parser/exit.c @@ -27,9 +27,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(MSDOS) -#include -#endif /* Default version of PARSER m_exit(). Allows interface control if internal error causes PARSER to halt. */ diff --git a/cde/programs/dthelp/parser/pass2/parser/minim.c b/cde/programs/dthelp/parser/pass2/parser/minim.c index 9421a446d..2a7564db6 100644 --- a/cde/programs/dthelp/parser/pass2/parser/minim.c +++ b/cde/programs/dthelp/parser/pass2/parser/minim.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/pass2/parser/param.c b/cde/programs/dthelp/parser/pass2/parser/param.c index 9f63e3f52..528c890dc 100644 --- a/cde/programs/dthelp/parser/pass2/parser/param.c +++ b/cde/programs/dthelp/parser/pass2/parser/param.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "delim.h" diff --git a/cde/programs/dthelp/parser/pass2/parser/parutil.c b/cde/programs/dthelp/parser/pass2/parser/parutil.c index d69d15813..499a91b3b 100644 --- a/cde/programs/dthelp/parser/pass2/parser/parutil.c +++ b/cde/programs/dthelp/parser/pass2/parser/parutil.c @@ -33,9 +33,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/pass2/parser/scan.c b/cde/programs/dthelp/parser/pass2/parser/scan.c index d42ac8f1c..309d0c51c 100644 --- a/cde/programs/dthelp/parser/pass2/parser/scan.c +++ b/cde/programs/dthelp/parser/pass2/parser/scan.c @@ -32,9 +32,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #define M_CONDEF diff --git a/cde/programs/dthelp/parser/pass2/parser/struct.c b/cde/programs/dthelp/parser/pass2/parser/struct.c index 164fa798e..a0cebd549 100644 --- a/cde/programs/dthelp/parser/pass2/parser/struct.c +++ b/cde/programs/dthelp/parser/pass2/parser/struct.c @@ -33,9 +33,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" #include "dtdext.h" diff --git a/cde/programs/dthelp/parser/pass2/util/context.c b/cde/programs/dthelp/parser/pass2/util/context.c index c18345f79..080ff411c 100644 --- a/cde/programs/dthelp/parser/pass2/util/context.c +++ b/cde/programs/dthelp/parser/pass2/util/context.c @@ -157,9 +157,6 @@ delim.h. #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass2/util/conutil.c b/cde/programs/dthelp/parser/pass2/util/conutil.c index d427156d3..8607f124b 100644 --- a/cde/programs/dthelp/parser/pass2/util/conutil.c +++ b/cde/programs/dthelp/parser/pass2/util/conutil.c @@ -31,9 +31,6 @@ This product and information is proprietary of Tandem Computers Incorporated. #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #include "trie.h" diff --git a/cde/programs/dthelp/parser/pass2/util/emptyfil.c b/cde/programs/dthelp/parser/pass2/util/emptyfil.c index a9d94c046..a373d097f 100644 --- a/cde/programs/dthelp/parser/pass2/util/emptyfil.c +++ b/cde/programs/dthelp/parser/pass2/util/emptyfil.c @@ -24,9 +24,6 @@ /* Copyright (c) 1988, 1989 Hewlett-Packard Co. */ /* Creates a file with nothing in it */ #include -#if defined(MSDOS) -#include -#endif #include "basic.h" void main(int argc, char **argv); diff --git a/cde/programs/dthelp/parser/pass2/util/exit.c b/cde/programs/dthelp/parser/pass2/util/exit.c index 4389c94e8..ed0ca63eb 100644 --- a/cde/programs/dthelp/parser/pass2/util/exit.c +++ b/cde/programs/dthelp/parser/pass2/util/exit.c @@ -25,9 +25,6 @@ Copyright 1988, 1989 Hewlett-Packard Co. */ -#if defined(MSDOS) -#include -#endif #include "basic.h" void m_exit(int status); diff --git a/cde/programs/dthelp/parser/pass2/util/fclndir.c b/cde/programs/dthelp/parser/pass2/util/fclndir.c index c2abd295b..680608055 100644 --- a/cde/programs/dthelp/parser/pass2/util/fclndir.c +++ b/cde/programs/dthelp/parser/pass2/util/fclndir.c @@ -37,9 +37,6 @@ with an error code of 0 if the files are the same, 1 if they differ, and #include #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" #define SAME 0 /* different defined to be 0 as of 12-1-89, because fclndir now does @@ -124,11 +121,7 @@ void copyfile(pfile1,pfile2) spaces, and the terminating null */ slen = strlen(pfile1) + strlen(pfile2) + 8; pcmd = (char *) malloc(slen); -#if defined(MSDOS) - ret = snprintf(pcmd, slen, "copy %s %s",pfile1,pfile2); -#else ret = snprintf(pcmd, slen, "cp %s %s",pfile1,pfile2); -#endif ret = system(pcmd); ret = snprintf(pcmd, slen, "touch %s",pfile2); ret = system(pcmd); diff --git a/cde/programs/dthelp/parser/pass2/util/inctest.c b/cde/programs/dthelp/parser/pass2/util/inctest.c index ce3a58d1c..a9a393219 100644 --- a/cde/programs/dthelp/parser/pass2/util/inctest.c +++ b/cde/programs/dthelp/parser/pass2/util/inctest.c @@ -25,9 +25,6 @@ Copyright 1986, 1987, 1988, 1989 Hewlett-Packard Co. */ -#if defined(MSDOS) -#include -#endif #include "basic.h" void m_err1(const char *text, const char *arg); diff --git a/cde/programs/dthelp/parser/pass2/util/malloc.c b/cde/programs/dthelp/parser/pass2/util/malloc.c index abed1c7ee..bead0dbdf 100644 --- a/cde/programs/dthelp/parser/pass2/util/malloc.c +++ b/cde/programs/dthelp/parser/pass2/util/malloc.c @@ -28,9 +28,6 @@ /**/ #include #include -#if defined(MSDOS) -#include -#endif #include "basic.h" extern LOGICAL m_heapchk ; @@ -56,9 +53,6 @@ void m_free(void *block, char *msg) { char buffer[32] ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (m_malftrace) { #if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", @@ -73,46 +67,8 @@ void m_free(void *block, char *msg) m_trace("\n") ; } free(block) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif } -#if defined(MSDOS) -void m_heapdump(void) - { - struct _heapinfo hinfo ; - int heapstatus ; - - heapstatus = _heapchk() ; - if (heapstatus == _HEAPOK || heapstatus == _HEAPEMPTY) return ; - printf("\nDumping heap:\n") ; - hinfo._pentry = NULL ; - while ((heapstatus = _heapwalk(&hinfo)) == _HEAPOK) - printf("%6s block at %p of size %4.4X\n", - hinfo._useflag == _USEDENTRY ? "USED" : "FREE", - hinfo._pentry, hinfo._size) ; - switch(heapstatus) { - case _HEAPEMPTY: - printf("OK - empty heap\n\n") ; - break ; - case _HEAPEND: - printf("OK - end of heap\n\n") ; - break ; - case _HEAPBADPTR: - printf("Error - bad pointer to heap\n\n") ; - break ; - case _HEAPBADBEGIN: - printf("Error - bad start of heap\n\n") ; - break ; - case _HEAPBADNODE: - printf("Error - bad node in heap\n\n") ; - break ; - } - m_exit(TRUE) ; - } -#endif - void *m_malloc(size, msg) int size ; char *msg ; @@ -121,14 +77,8 @@ void *m_malloc(size, msg) void *p ; size *= sizeof(M_WCHAR); -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! size) return(NULL) ; p = (void *) malloc(size) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! p) { m_errline("Unable to allocate space for ") ; m_errline(msg) ; @@ -162,14 +112,8 @@ void *m_realloc(ptr, size, msg) void *p ; size *= sizeof(M_WCHAR); -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! size) return(NULL) ; p = (void *) realloc(ptr, size) ; -#if defined(MSDOS) - if (m_heapchk) m_heapdump() ; -#endif if (! p) { m_errline("Unable to re-allocate space for ") ; m_errline(msg) ; diff --git a/cde/programs/dthelp/parser/pass2/util/openchk.c b/cde/programs/dthelp/parser/pass2/util/openchk.c index 2bd2e681f..25445b13d 100644 --- a/cde/programs/dthelp/parser/pass2/util/openchk.c +++ b/cde/programs/dthelp/parser/pass2/util/openchk.c @@ -26,9 +26,6 @@ */ #include -#if defined(MSDOS) -#include -#endif #include "basic.h" extern FILE *m_errfile ; diff --git a/cde/programs/dthelp/parser/pass2/util/trie.c b/cde/programs/dthelp/parser/pass2/util/trie.c index 945b1cee5..1476ed76f 100644 --- a/cde/programs/dthelp/parser/pass2/util/trie.c +++ b/cde/programs/dthelp/parser/pass2/util/trie.c @@ -31,10 +31,6 @@ #include -#if defined(MSDOS) -#include -#endif - #include "basic.h" #include "common.h" #include "trie.h"