dthelp: Remove define M_PROTO that was always turned on (for all platforms) that enabled ANSI not K&R function prototypes

2018-06-22 20:40:47 +01:00
parent de7e0dfcdd
commit 725b02e6bf
218 changed files with 2975 additions and 14075 deletions
--- a/cde/programs/dthelp/parser/pass1/util/allwhite.c
+++ b/cde/programs/dthelp/parser/pass1/util/allwhite.c
@@ -26,25 +26,12 @@
 */
 #include "basic.h"

-LOGICAL m_allwhite(
-#if defined(M_PROTO)
-  const M_WCHAR *string
-#endif
-  ) ;
+LOGICAL m_allwhite(const M_WCHAR *string);

-LOGICAL m_whitespace(
-#if defined(M_PROTO)
-  M_WCHAR c
-#endif
-  ) ;
+LOGICAL m_whitespace(M_WCHAR c);

 /* Test if a string contains only white space characters */
-#if defined(M_PROTO)
 LOGICAL m_allwhite(const M_WCHAR *string )
-#else
-LOGICAL m_allwhite(string)
-M_WCHAR *string ;
-#endif /* M_PROTO */
 {
 const M_WCHAR *p ;

--- a/cde/programs/dthelp/parser/pass1/util/basic.h
+++ b/cde/programs/dthelp/parser/pass1/util/basic.h
@@ -46,87 +46,29 @@ typedef wchar_t M_WCHAR;

 /* For function prototypes */
 typedef char * M_POINTER;
-#if defined(hpux) || defined(__aix) || defined(sun)
-/* Old unix stuff
- *#define void int
- *#define M_NOPAR
- */
-/* New Ansi style */
-#define M_PROTO
+
 #define M_NOPAR void
-#else
-#define M_PROTO
-#define M_NOPAR void
-#endif

-char *MakeMByteString(
-#if defined(M_PROTO)
-  const M_WCHAR *from
-#endif
-  );
+char *MakeMByteString(const M_WCHAR *from);

-M_WCHAR *MakeWideCharString(
-#if defined(M_PROTO)
-  const char *from
-#endif
-  );
+M_WCHAR *MakeWideCharString(const char *from);

-int w_strcmp(
-#if defined(M_PROTO)
-  const M_WCHAR *string1, const M_WCHAR *string2
-#endif
-  );
+int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2);

-M_WCHAR *w_strcpy(
-#if defined(M_PROTO)
-  M_WCHAR *string1, const M_WCHAR *string2
-#endif
-  );
+M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2);

-M_WCHAR *w_strncpy(
-#if defined(M_PROTO)
-  M_WCHAR *string1, const M_WCHAR *string2, int max
-#endif
-  );
+M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max);

-int w_strlen(
-#if defined(M_PROTO)
-  const M_WCHAR *string
-#endif
-  );
+int w_strlen(const M_WCHAR *string);

-M_WCHAR *w_strchr(
-#if defined(M_PROTO)
-  M_WCHAR *string, const M_WCHAR chr
-#endif
-  );
+M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr);

-M_WCHAR *w_strstr(
-#if defined(M_PROTO)
-  M_WCHAR *string1, M_WCHAR *string2
-#endif
-  );
+M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2);

-void *m_malloc(
-#if defined(M_PROTO)
-  int size, char *msg
-#endif
-  ) ;
+void *m_malloc(int size, char *msg);

-void m_free(
-#if defined(M_PROTO)
-  void *block, char *msg
-#endif
-  ) ;
+void m_free(void *block, char *msg);

-void m_err2(
-#if defined(M_PROTO)
-  const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
-#endif
-  ) ;
+void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);

-int mb_getwc(
-#if defined(M_PROTO)
-  void *m_ptr
-#endif
-  ) ;
+int mb_getwc(void *m_ptr);
--- a/cde/programs/dthelp/parser/pass1/util/cont.h
+++ b/cde/programs/dthelp/parser/pass1/util/cont.h
@@ -37,179 +37,63 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #define CONTINIT(a)
 #endif

-void countdown(
-#if defined(M_PROTO)
-  M_TRIE *parent, int *count
-#endif
-  ) ;
+void countdown(M_TRIE *parent, int *count);

-void dumpdlmptr(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+void dumpdlmptr(M_NOPAR);

-void dumpnode(
-#if defined(M_PROTO)
-  LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)
-#endif
-  ) ;
+void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc));

-void dumptree(
-#if defined(M_PROTO)
-  LOGICAL sparse
-#endif
-  ) ;
+void dumptree(LOGICAL sparse);

-void enterdelim(
-#if defined(M_PROTO)
-  int n
-#endif
-  ) ;
+void enterdelim(int n);

-void m_error(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void m_error(char *text);

-void m_err1(
-#if defined(M_PROTO)
-  char *text, char *arg
-#endif
-  ) ;
+void m_err1(char *text, char *arg);

-void getcode(
-#if defined(M_PROTO)
-  int n
-#endif
-  ) ;
+void getcode(int n);

-void getcolon(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+void getcolon(M_NOPAR);

-int getContext(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+int getContext(M_NOPAR);

-LOGICAL getdname(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+LOGICAL getdname(M_NOPAR);

-void inccon(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+void inccon(M_NOPAR);

-void incdelim(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+void incdelim(M_NOPAR);

-void loaddelim(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+void loaddelim(M_NOPAR);

-int m_lower(
-#if defined(M_PROTO)
-  int c
-#endif
-  ) ;
+int m_lower(int c);

-int main(
-#if defined(M_PROTO)
-  int argc, char **argv
-#endif
-  ) ;
+int main(int argc, char **argv);

-void *m_malloc(
-#if defined(M_PROTO)
-  int size, char *msg
-#endif
-  ) ;
+void *m_malloc(int size, char *msg);

-void nextcon(
-#if defined(M_PROTO)
-  LOGICAL sparse
-#endif
-  ) ;
+void nextcon(LOGICAL sparse);

-void m_openchk(
-#if defined(M_PROTO)
-  FILE **ptr, char *name, char *mode
-#endif
-  ) ;
+void m_openchk(FILE **ptr, char *name, char *mode);

-void printval(
-#if defined(M_PROTO)
-  FILE *file, M_TRIE *value
-#endif
-  ) ;
+void printval(FILE *file, M_TRIE *value);

-void prtctxt(
-#if defined(M_PROTO)
-  int column, int value
-#endif
-  ) ;
+void prtctxt(int column, int value);

-int readchar(
-#if defined(M_PROTO)
-  LOGICAL cap
-#endif
-  ) ;
+int readchar(LOGICAL cap);

-void skiptoend(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+void skiptoend(M_NOPAR);

-void unread(
-#if defined(M_PROTO)
-  int c
-#endif
-  ) ;
+void unread(int c);

-int m_upper(
-#if defined(M_PROTO)
-  int c
-#endif
-  ) ;
+int m_upper(int c);

-void warning(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void warning(char *text);

-void warning1(
-#if defined(M_PROTO)
-  char *text, char *arg
-#endif
-  ) ;
+void warning1(char *text, char *arg);

-void warning2(
-#if defined(M_PROTO)
-  char *text, char *arg1, char *arg2
-#endif
-  ) ;
+void warning2(char *text, char *arg1, char *arg2);

-LOGICAL m_whitespace(
-#if defined(M_PROTO)
-  M_WCHAR c
-#endif
-  ) ;
+LOGICAL m_whitespace(M_WCHAR c);


 #define NOMORE -1
--- a/cde/programs/dthelp/parser/pass1/util/conutil.c
+++ b/cde/programs/dthelp/parser/pass1/util/conutil.c
@@ -55,12 +55,7 @@ void dumpdlmptr(M_NOPAR)
    }

 /* Output the generated data structures */
-#if defined(M_PROTO)
 void dumptree(LOGICAL sparse)
-#else
-void dumptree(sparse)
-  LOGICAL sparse;
-#endif
  {
    int i, count = 0;

@@ -570,12 +565,7 @@ loading = FALSE;
 }

 /* Output transition matrix */
-#if defined(M_PROTO)
 void nextcon(LOGICAL sparse)
-#else
-void nextcon(sparse)
-  LOGICAL sparse;
-#endif
  {
    int i, j;
    int firstinrow;
@@ -642,12 +632,7 @@ void prtctxt(column, value)


 /* Read the next input character */
-#if defined(M_PROTO)
 int readchar(LOGICAL cap)
-#else
-int readchar(cap)
-  LOGICAL cap;
-#endif
 {
 int c;
 M_WCHAR wnl;
--- a/cde/programs/dthelp/parser/pass1/util/emptyfil.c
+++ b/cde/programs/dthelp/parser/pass1/util/emptyfil.c
@@ -29,15 +29,7 @@
 #endif
 #include "basic.h"

-void main(
-#if defined(M_PROTO)
-  int argc, char **argv
-#endif
-  ) ;
-
-void main(argc, argv)
-  int argc ;
-  char **argv ;
+void main(int argc, char **argv)
  {
    if (argc != 2) {
      fprintf(stderr, "Usage: emptyfil filename\n") ;
--- a/cde/programs/dthelp/parser/pass1/util/entout.c
+++ b/cde/programs/dthelp/parser/pass1/util/entout.c
@@ -25,23 +25,11 @@

 /* Entout has procedures to write generated entity TRIE */

-void entptr(
-#if defined(M_PROTO)
-  M_ENTITY *data
-#endif
-  ) ;
+void entptr(M_ENTITY *data);

-char *typetype(
-#if defined(M_PROTO)
-  int n
-#endif
-  ) ;
+char *typetype(int n);

-char *typewhere(
-#if defined(M_PROTO)
-  unsigned char n
-#endif
-  ) ;
+char *typewhere(unsigned char n);

 /* Macro names written to output file */
 char xdbuild[] = "M_DBUILD" ;
@@ -212,12 +200,7 @@ char *typetype(n)
    }

 /* Typewhere returns a string indicating where the nth entity was defined.*/
-#if defined(M_PROTO)
 char *typewhere(unsigned char n)
-#else
-char *typewhere(n)
-  unsigned char n ;
-#endif
  {
    switch(n) {
      case M_DBUILD: return(xdbuild) ;
--- a/cde/programs/dthelp/parser/pass1/util/error.c
+++ b/cde/programs/dthelp/parser/pass1/util/error.c
@@ -33,128 +33,47 @@ extern FILE *m_errfile ;
 extern int m_line ;
 extern LOGICAL errexit ;

-void eprefix(
-#if defined(M_PROTO)
-  LOGICAL flag
-#endif
-  ) ;
+void eprefix(LOGICAL flag);

-void m_errline(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void m_errline(char *text);

-void m_error(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void m_error(char *text);

-void m_err1(
-#if defined(M_PROTO)
-  char *text, const M_WCHAR *arg
-#endif
-  ) ;
+void m_err1(char *text, const M_WCHAR *arg);

-void m_mberr1(
-#if defined(M_PROTO)
-  char *text, const char *arg
-#endif
-  ) ;
+void m_mberr1(char *text, const char *arg);

-void m_err2(
-#if defined(M_PROTO)
-  const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
-#endif
-  ) ;
+void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);

-void m_err3(
-#if defined(M_PROTO)
-  char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
-#endif
-  ) ;
+void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);

-void m_err5(
-#if defined(M_PROTO)
-  char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4,
-	      M_WCHAR *arg5
-#endif
-  ) ;
+void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4,
+	      M_WCHAR *arg5);

-void esuffix(
-#if defined(M_PROTO)
-  void
-#endif
-  ) ;
+void esuffix(void);

-void msgline(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void msgline(char *text);

-void msg1line(
-#if defined(M_PROTO)
-  char *text, char *arg1
-#endif
-  ) ;
+void msg1line(char *text, char *arg1);

-void skiptoend(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+void skiptoend(M_NOPAR);

-void m_wctrace(
-#if defined(M_PROTO)
-  M_WCHAR *text
-#endif
-  ) ;
+void m_wctrace(M_WCHAR *text);

-void m_trace(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void m_trace(char *text);

-void warning(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void warning(char *text);

-void warning1(
-#if defined(M_PROTO)
-  char *text, M_WCHAR *arg
-#endif
-  ) ;
+void warning1(char *text, M_WCHAR *arg);

-void warning2(
-#if defined(M_PROTO)
-  char *text, M_WCHAR *arg1, M_WCHAR *arg2
-#endif
-  ) ;
+void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2);

-void warning3(
-#if defined(M_PROTO)
-  char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
-#endif
-  ) ;
+void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);

-void warning4(
-#if defined(M_PROTO)
-  char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4
-#endif
-  ) ;
+void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4);

 /* Write error message prefix */
-#if defined(M_PROTO)
 void eprefix(LOGICAL flag)
-#else
-void eprefix(flag)
-  LOGICAL flag ;
-#endif
  {
    if (flag) errexit = TRUE ;
    fprintf(stderr, "\n**** ") ;
@@ -184,13 +103,7 @@ void m_error(text)

 /* Writes an error message with one argument to standard error and file
   "error" */
-#if defined(M_PROTO)
 void m_err1(char *text, const M_WCHAR *arg)
-#else
-void m_err1(text, arg)
-  char *text;
-  M_WCHAR *arg ;
-#endif
 {
 char *mb_arg;

@@ -203,13 +116,7 @@ skiptoend() ;
 m_free(mb_arg,"multi-byte string");
 }

-#if defined(M_PROTO)
 void m_mberr1(char *text, const char *arg)
-#else
-void m_err1(text, arg)
-  char *text;
-  char *arg ;
-#endif
 {
 eprefix(TRUE) ;
 fprintf(stderr, text, arg) ;
@@ -220,13 +127,7 @@ skiptoend() ;

 /* Writes an error message with two arguments to standard error and file
   "error" */
-#if defined(M_PROTO)
 void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2)
-#else
-void m_err2(text, arg1, arg2)
-char *text;
-M_WCHAR *arg1, *arg2 ;
-#endif
 {
 char *mb_arg1, *mb_arg2;

@@ -243,13 +144,7 @@ m_free(mb_arg2,"multi-byte string");

 /* Writes an error message with three arguments to standard error and file
   "error" */
-#if defined(M_PROTO)
 void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3)
-#else
-void m_err3(text, arg1, arg2, arg3)
-char *text;
-M_WCHAR *arg1, *arg2, *arg3 ;
-#endif
 {
 char *mb_arg1, *mb_arg2, *mb_arg3;

@@ -268,14 +163,8 @@ m_free(mb_arg3,"multi-byte string");

 /* Writes an error message with five arguments to standard error and file
   "error" */
-#if defined(M_PROTO)
 void m_err5( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3,
 	     M_WCHAR *arg4, M_WCHAR *arg5)
-#else
-void m_err5(text, arg1, arg2, arg3, arg4, arg5)
-char *text;
-M_WCHAR *arg1, *arg2, *arg3, *arg4, *arg5 ;
-#endif
 {
 char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5;

@@ -347,13 +236,7 @@ void warning(text)

 /* Writes a nonfatal error message with one argument to standard error
   and file "error" */
-#if defined(M_PROTO)
 void warning1( char *text, M_WCHAR *arg)
-#else
-void warning1(text, arg)
-char *text;
-M_WCHAR *arg ;
-#endif
 {
 char *mb_arg;

@@ -367,13 +250,7 @@ m_free(mb_arg,"multi-byte string");

 /* Writes a nonfatal error message with two arguments to standard error
   and file "error" */
-#if defined(M_PROTO)
 void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2)
-#else
-void warning2(text, arg1, arg2)
-char *text;
-M_WCHAR *arg1, *arg2 ;
-#endif
 {
 char *mb_arg1, *mb_arg2;

@@ -389,13 +266,7 @@ m_free(mb_arg2,"multi-byte string");

 /* Writes a nonfatal error message with three arguments to standard error
   and file "error" */
-#if defined(M_PROTO)
 void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3)
-#else
-void warning3(text, arg1, arg2, arg3)
-char *text;
-M_WCHAR *arg1, *arg2, *arg3 ;
-#endif
 {
 char *mb_arg1, *mb_arg2, *mb_arg3;

@@ -413,14 +284,8 @@ m_free(mb_arg3,"multi-byte string");

 /* Writes a nonfatal error message with four arguments to standard error
   and file "error" */
-#if defined(M_PROTO)
 void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3,
 	      M_WCHAR *arg4)
-#else
-void warning4(text, arg1, arg2, arg3, arg4)
-char *text;
-M_WCHAR *arg1, *arg2, *arg3, *arg4 ;
-#endif
 {
 char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4;

--- a/cde/programs/dthelp/parser/pass1/util/exit.c
+++ b/cde/programs/dthelp/parser/pass1/util/exit.c
@@ -30,11 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 #endif
 #include "basic.h"

-void m_exit(
-#if defined(M_PROTO)
-  int status
-#endif
-  ) ;
+void m_exit(int status);

 /* Exit function called by utilities used in PARSER and other programs in
   the MARKUP system */
--- a/cde/programs/dthelp/parser/pass1/util/fclndir.c
+++ b/cde/programs/dthelp/parser/pass1/util/fclndir.c
@@ -58,23 +58,11 @@ struct data {
 char linedir[] = "#line" ;
 char *p = linedir, *q = linedir + 1 ;

-int main(
-#if defined(M_PROTO)
-  int argc, char **argv
-#endif
-  ) ;
+int main(int argc, char **argv);

-void copyfile(
-#if defined(m_proto)
-  char *pfile1, char *pfile2
-#endif
-  ) ;
+void copyfile(char *pfile1, char *pfile2);

-int nextchar(
-#if defined (M_PROTO)
-  FILE *file, struct data *data
-#endif
-  ) ;
+int nextchar(FILE *file, struct data *data);

 int main(argc, argv)
  int argc ;
--- a/cde/programs/dthelp/parser/pass1/util/inctest.c
+++ b/cde/programs/dthelp/parser/pass1/util/inctest.c
@@ -30,23 +30,11 @@
 #endif
 #include "basic.h"

-void m_err1(
-#if defined(M_PROTO)
-  const char *text, const char *arg
-#endif
-  ) ;
+void m_err1(const char *text, const char *arg);

-void m_exit(
-#if defined(M_PROTO)
-  int status
-#endif
-  ) ;
+void m_exit(int status);

-void m_inctest(
-#if defined(M_PROTO)
-  int *count, int limit, char *message
-#endif
-  ) ;
+void m_inctest(int *count, int limit, char *message);

 /* Increment a count and test against a limit */
 void m_inctest(count, limit, message)
--- a/cde/programs/dthelp/parser/pass1/util/initct.c
+++ b/cde/programs/dthelp/parser/pass1/util/initct.c
@@ -29,12 +29,6 @@
 #include "common.h"
 extern char m_chartype[M_CHARSETLEN] ;

-void m_initctype(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
-
 void m_initctype(M_NOPAR)
  {
    int i ;
--- a/cde/programs/dthelp/parser/pass1/util/itoa.c
+++ b/cde/programs/dthelp/parser/pass1/util/itoa.c
@@ -27,17 +27,9 @@
 #include <string.h>
 #include "basic.h"

-char *m_itoa(
-#if defined(M_PROTO)
-  int n, char *s
-#endif
-  ) ;
+char *m_itoa(int n, char *s);

-void reverse(
-#if defined(M_PROTO)
-  char *s
-#endif
-  ) ;
+void reverse(char *s);

 char *m_itoa(n, s)  /* convert n to characters in s */
 char s[]; 
--- a/cde/programs/dthelp/parser/pass1/util/letter.c
+++ b/cde/programs/dthelp/parser/pass1/util/letter.c
@@ -27,18 +27,7 @@

 #include "basic.h"

-LOGICAL m_letter(
-#if defined(M_PROTO)
-  M_WCHAR c
-#endif
-  ) ;
-
-#if defined(M_PROTO)
 LOGICAL m_letter(M_WCHAR c)
-#else
-LOGICAL m_letter(c)
-  M_WCHAR c ;
-#endif
 {
 if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) return(TRUE) ;
 return(FALSE) ;
--- a/cde/programs/dthelp/parser/pass1/util/lower.c
+++ b/cde/programs/dthelp/parser/pass1/util/lower.c
@@ -27,11 +27,7 @@

 #include "basic.h"

-int m_lower(
-#if defined(M_PROTO)
-  int c
-#endif
-  ) ;
+int m_lower(int c);



--- a/cde/programs/dthelp/parser/pass1/util/malloc.c
+++ b/cde/programs/dthelp/parser/pass1/util/malloc.c
@@ -36,53 +36,21 @@
 extern LOGICAL m_heapchk ;
 extern LOGICAL m_malftrace ;

-void m_errline(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void m_errline(char *text);

-void m_exit(
-#if defined(M_PROTO)
-  int status
-#endif
-  ) ;
+void m_exit(int status);

-void m_free(
-#if defined(M_PROTO)
-  void *block, char *msg
-#endif
-  ) ;
+void m_free(void *block, char *msg);

-void m_heapdump(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+void m_heapdump(M_NOPAR);

-void *m_malloc(
-#if defined(M_PROTO)
-  int size, char *msg
-#endif
-  ) ;
+void *m_malloc(int size, char *msg);

-void *m_realloc(
-#if defined(M_PROTO)
-  void *ptr, int size, char *msg
-#endif
-  ) ;
+void *m_realloc(void *ptr, int size, char *msg);

-void *m_trace(
-#if defined(M_PROTO)
-  char *text
-#endif
-  ) ;
+void *m_trace(char *text);

-void *m_wctrace(
-#if defined(M_PROTO)
-  M_WCHAR *text
-#endif
-  ) ;
+void *m_wctrace(M_WCHAR *text);

 void m_free(block, msg)
  void *block ;
--- a/cde/programs/dthelp/parser/pass1/util/openchk.c
+++ b/cde/programs/dthelp/parser/pass1/util/openchk.c
@@ -33,17 +33,9 @@

 extern FILE *m_errfile ;

-void m_exit(
-#if defined(M_PROTO)
-  int status
-#endif
-  ) ;
+void m_exit(int status);

-void m_openchk(
-#if defined(M_PROTO)
-  FILE **ptr, char *name, char *mode
-#endif
-  ) ;
+void m_openchk(FILE **ptr, char *name, char *mode);

 /* Open a file and check that the open succeeded */
 void m_openchk(ptr, name, mode)
--- a/cde/programs/dthelp/parser/pass1/util/paramu.c
+++ b/cde/programs/dthelp/parser/pass1/util/paramu.c
@@ -33,13 +33,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Check to see if string is a valid value for parameter par.  If so
   return a pointer to the keyword if it's a keyword parameter and otherwise
   a pointer to string.  If not valid, return FALSE. */
-#if defined(M_PROTO)
 const M_WCHAR *m_partype(const int par , const M_WCHAR *string )
-#else
-M_WCHAR *m_partype(par, string)
-  int par ;
-  M_WCHAR *string ;
-#endif /* M_PROTO */
  {
    LOGICAL first = TRUE ;
    int kw ;
--- a/cde/programs/dthelp/parser/pass1/util/sparse.h
+++ b/cde/programs/dthelp/parser/pass1/util/sparse.h
@@ -29,11 +29,7 @@
 #if defined(sparse)
 #define m_newcon(i, j) m_sprscon(i, j)

-int m_sprscon(
-#if defined(M_PROTO)
-  int i, int j
-#endif
-  ) ;
+int m_sprscon(int i, int j);

 #else
 #define m_newcon(i, j) m_nextcon[i][j]
--- a/cde/programs/dthelp/parser/pass1/util/trie.c
+++ b/cde/programs/dthelp/parser/pass1/util/trie.c
@@ -45,26 +45,12 @@ extern FILE *m_errfile ;

 extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ;

-void *m_malloc(
-#if defined(M_PROTO)
-  int size, char *msg
-#endif
-  ) ;
+void *m_malloc(int size, char *msg);

-void m_entercharintrie(
-#if defined(M_PROTO)
-  M_TRIE **currentnode, M_WCHAR c
-#endif
-  ) ;
+void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c);

 /* Enters the next character of a string into a trie */
-#if defined(M_PROTO)
 void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c)
-#else
-void m_entercharintrie(currentnode, c)
-  M_TRIE **currentnode ;
-  M_WCHAR c ;
-#endif
  {
    M_TRIE *newnode ;

@@ -112,13 +98,7 @@ M_TRIE *m_gettrienode(M_NOPAR)

 /* M_lookfortrie(p, xtrie) looks for string p in the specified trie,
   returning its data value if found and otherwise FALSE */
-#if defined(M_PROTO)
 void *m_lookfortrie( const M_WCHAR *p , const M_TRIE *xtrie )
-#else
-void *m_lookfortrie(p, xtrie)
-  M_WCHAR *p ;
-  M_TRIE *xtrie ;
-#endif /* M_PROTO */
  {
    M_TRIE *currentnode ;

--- a/cde/programs/dthelp/parser/pass1/util/trie.h
+++ b/cde/programs/dthelp/parser/pass1/util/trie.h
@@ -51,26 +51,10 @@ struct m_ptrie {
  } ;


-M_TRIE *m_gettrienode(
-#if defined(M_PROTO)
-  M_NOPAR
-#endif
-  ) ;
+M_TRIE *m_gettrienode(M_NOPAR);

-void *m_lookfortrie(
-#if defined(M_PROTO)
-  const M_WCHAR *p, const M_TRIE *xtrie
-#endif
-  ) ;
+void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie);

-void *m_ntrtrie(
-#if defined(M_PROTO)
-  M_WCHAR *p, M_TRIE *xtrie, void *dataval
-#endif
-  ) ;
+void *m_ntrtrie(M_WCHAR *p, M_TRIE *xtrie, void *dataval);

-void *m_resettrie(
-#if defined(M_PROTO)
-  M_TRIE *xtrie, M_WCHAR *p, void *value
-#endif
-  ) ;
+void *m_resettrie(M_TRIE *xtrie, M_WCHAR *p, void *value);
--- a/cde/programs/dthelp/parser/pass1/util/triecnt.c
+++ b/cde/programs/dthelp/parser/pass1/util/triecnt.c
@@ -31,24 +31,12 @@
 #include "basic.h"
 #include "trie.h"

-void countdown(
-#if defined(M_PROTO)
-  M_TRIE *parent, int *count
-#endif
-  ) ;
+void countdown(M_TRIE *parent, int *count);

-void dumpnode(
-#if defined(M_PROTO)
-  LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count,
-    void (*proc)(FILE *file, void *value)
-#endif
-  ) ;
+void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count,
+    void (*proc)(FILE *file, void *value));

-void printval(
-#if defined(M_PROTO)
-  FILE *file, void *value
-#endif
-  ) ;
+void printval(FILE *file, void *value);

 /* Count the descendants of a node in order to generate declarations for
   the packed form of a trie*/
@@ -71,12 +59,7 @@ void dumpnode(first, file, trieptr, count, proc)
  FILE *file ;
  M_TRIE *trieptr ;
  int *count ;
-  void (*proc) (
-#if defined (M_PROTO)
-    FILE *file, 
-    void *value
-#endif
-    ) ;
+  void (*proc) (FILE *file, void *value);
  {
    M_TRIE *p ;
    int savecount ;
--- a/cde/programs/dthelp/parser/pass1/util/triedump.c
+++ b/cde/programs/dthelp/parser/pass1/util/triedump.c
@@ -29,18 +29,10 @@
 #include "basic.h"
 #include "trie.h"

-void countdown(
-#if defined(M_PROTO)
-  M_TRIE *parent, int *count
-#endif
-  ) ;
+void countdown(M_TRIE *parent, int *count);

-void m_dumptrie(
-#if defined(M_PROTO)
-  FILE *file, M_TRIE *xtrie, char *extname, int *count,
-  void (*proc)(void *value)
-#endif
-  ) ;
+void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count,
+  void (*proc)(void *value));

 /* Write the C declaration of a trie */
 void m_dumptrie(file, xtrie, extname, count, proc)
@@ -48,11 +40,7 @@ void m_dumptrie(file, xtrie, extname, count, proc)
  M_TRIE *xtrie ;
  char *extname ;
  int *count ;
-  void (*proc)(
-#if defined(M_PROTO)
-    void *value
-#endif
-    ) ;
+  void (*proc)(void *value);
  {
    int firstson ;
    M_TRIE *p ;
--- a/cde/programs/dthelp/parser/pass1/util/triepdmp.c
+++ b/cde/programs/dthelp/parser/pass1/util/triepdmp.c
@@ -29,25 +29,13 @@
 #include "basic.h"
 #include "trie.h"

-void countdown(
-#if defined(M_PROTO)
-  M_TRIE *parent, int *count
-#endif
-  ) ;
+void countdown(M_TRIE *parent, int *count);

-void dumpnode(
-#if defined(M_PROTO)
-  LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count,
-    void (*proc)(FILE *file, void *value)
-#endif
-  ) ;
+void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count,
+    void (*proc)(FILE *file, void *value));

-void dumpptrie(
-#if defined(M_PROTO)
-  M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef,
-  void (*proc)(FILE *file, void *value)
-#endif
-  ) ;
+void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef,
+  void (*proc)(FILE *file, void *value));

 /* Write the declaration of a packed trie to the specified files */
 void dumpptrie(intname, extname, file, externdef, defdef, proc)
@@ -56,12 +44,7 @@ void dumpptrie(intname, extname, file, externdef, defdef, proc)
  FILE *file ;
  char *externdef ;
  char *defdef ;
-  void (*proc) (
-#if defined (M_PROTO)
-    FILE *file,
-    void *value
-#endif
-    ) ;
+  void (*proc) (FILE *file, void *value);
  {
    LOGICAL first = TRUE ;
    int count = 0 ;
--- a/cde/programs/dthelp/parser/pass1/util/trieplk.c
+++ b/cde/programs/dthelp/parser/pass1/util/trieplk.c
@@ -36,12 +36,8 @@

 extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ;

-int m_packedlook(
-#if defined(M_PROTO)
-  M_PTRIE *xptrie,
-  M_WCHAR *name
-#endif
-  ) ;
+int m_packedlook(M_PTRIE *xptrie,
+  M_WCHAR *name);

 /* Look for the string NAME in the packed trie PTRIE */
 int m_packedlook(xptrie, name)
--- a/cde/programs/dthelp/parser/pass1/util/upcmp8.c
+++ b/cde/programs/dthelp/parser/pass1/util/upcmp8.c
@@ -32,30 +32,13 @@
 #include "common.h"
 extern M_CHARTYPE m_ctarray[256] ;

-int m_wcupstrcmp(
-#if defined(M_PROTO)
-  const M_WCHAR *p, const M_WCHAR *q
-#endif
-  ) ;
+int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q);

-int m_wcmbupstrcmp(
-#if defined(M_PROTO)
-  const M_WCHAR *p, const char *q
-#endif
-  ) ;
+int m_wcmbupstrcmp(const M_WCHAR *p, const char *q);

-int m_mbmbupstrcmp(
-#if defined(M_PROTO)
-  const char *p, const char *q
-#endif
-  ) ;
+int m_mbmbupstrcmp(const char *p, const char *q);

-#if defined(M_PROTO)
 int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q )
-#else
-int m_wcupstrcmp(p, q)
-  M_WCHAR *p, *q ;
-#endif /* M_PROTO */
  {
    do {
      if (m_ctupper(*p) < m_ctupper(*q)) return(-1) ;
@@ -65,13 +48,7 @@ int m_wcupstrcmp(p, q)
    return(0) ;
    }

-#if defined(M_PROTO)
 int m_wcmbupstrcmp(const M_WCHAR *p, const char *q)
-#else
-int m_wcmbupstrcmp(p, q)
-  M_WCHAR *p;
-  char *q ;
-#endif
  {
  M_WCHAR *wc;
  int      retval;
@@ -82,13 +59,7 @@ int m_wcmbupstrcmp(p, q)
  return retval;
  }

-#if defined(M_PROTO)
 int m_mbmbupstrcmp(const char *p, const char *q)
-#else
-int m_mbmbupstrcmp(p, q)
-  char *p;
-  char *q ;
-#endif
  {
  M_WCHAR *w_p, *w_q;
  int      retval;
--- a/cde/programs/dthelp/parser/pass1/util/upper.c
+++ b/cde/programs/dthelp/parser/pass1/util/upper.c
@@ -29,14 +29,7 @@

 #include "basic.h"

-int m_upper(
-#if defined(M_PROTO)
-  int c
-#endif
-  ) ;
-
-int m_upper(c)
-  int c ;
+int m_upper(int c)
  {
    if (c >= 'a' && c <= 'z') c += 'A' - 'a' ;
    return(c) ;
--- a/cde/programs/dthelp/parser/pass1/util/upstrcmp.c
+++ b/cde/programs/dthelp/parser/pass1/util/upstrcmp.c
@@ -29,20 +29,9 @@

 #include "basic.h"

-int m_upper(
-#if defined(M_PROTO)
-  int c
-#endif
-  ) ;
+int m_upper(int c);

-int m_upstrcmp(
-#if defined(M_PROTO)
-  char *p, char *q
-#endif
-  ) ;
-
-int m_upstrcmp(p, q)
-  char *p, *q ;
+int m_upstrcmp(char *p, char *q)
  {
    do {
      if (m_upper((int) *p) < m_upper((int) *q)) return(-1) ;
--- a/cde/programs/dthelp/parser/pass1/util/wchar.c
+++ b/cde/programs/dthelp/parser/pass1/util/wchar.c
@@ -32,13 +32,7 @@


 /* compare two wide character strings */
-#if defined(M_PROTO)
 int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2)
-#else
-int w_strcmp(string1, string2)
-M_WCHAR *string1;
-M_WCHAR *string2;
-#endif
 {
 M_WCHAR c1, c2, null;

@@ -60,13 +54,7 @@ while (1)


 /* copy a wide character string */
-#if defined(M_PROTO)
 M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2)
-#else
-M_WCHAR *w_strcpy(string1, string2)
-M_WCHAR *string1;
-M_WCHAR *string2;
-#endif
 {
 M_WCHAR *string1start;

@@ -79,14 +67,7 @@ return string1start;


 /* copy a wide character string, stopping after "max" moves */
-#if defined(M_PROTO)
 M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max)
-#else
-M_WCHAR *w_strncpy(string1, string2, max)
-M_WCHAR *string1;
-M_WCHAR *string2;
-int      max;
-#endif
 {
 M_WCHAR *string1start;

@@ -99,12 +80,7 @@ return string1start;


 /* get the length of a wide character string */
-#if defined(M_PROTO)
 int w_strlen(const M_WCHAR *string)
-#else
-int w_strlen(string)
-M_WCHAR *string;
-#endif
 {
 int length;

@@ -117,12 +93,7 @@ return length;


 /* find wide character "chr" in wide string "string" */
-#if defined(M_PROTO)
 M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr)
-#else
-M_WCHAR *w_strchr(string, chr)
-M_WCHAR *string, chr;
-#endif
 {
 M_WCHAR *where;

@@ -142,12 +113,7 @@ else


 /* find wide character "chr" in wide string "string" */
-#if defined(M_PROTO)
 M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2)
-#else
-M_WCHAR *w_strstr(string1, string2)
-M_WCHAR *string1, *string2;
-#endif
 {
 M_WCHAR *where1, *where2;

@@ -182,12 +148,7 @@ return NULL;


 /* make a multi-byte string from a wide character string */
-#if defined(M_PROTO)
 char *MakeMByteString(const M_WCHAR *wc_string)
-#else
-char *MakeMByteString(wc_string)
-M_WCHAR *wc_string;
-#endif
 {
 char   *mb_string;
 int     length, retVal;
@@ -217,12 +178,7 @@ return mb_string;


 /* make a wide character string from a multi-byte string */
-#if defined(M_PROTO)
 M_WCHAR *MakeWideCharString(const char *mb_string)
-#else
-M_WCHAR *MakeWideCharString(mb_string)
-char *mb_string;
-#endif
 {
 M_WCHAR *wc_string, *wc_stringStart;
 int      length, incr;
--- a/cde/programs/dthelp/parser/pass1/util/whitesp.c
+++ b/cde/programs/dthelp/parser/pass1/util/whitesp.c
@@ -27,19 +27,8 @@

 #include "basic.h"

-LOGICAL m_whitespace(
-#if defined(M_PROTO)
-  M_WCHAR c
-#endif
-  ) ;
-
 /* Test if character c is a blank, tab, or carriage return */
-#if defined(M_PROTO)
 LOGICAL m_whitespace(M_WCHAR c)
-#else
-LOGICAL m_whitespace(c)
-  M_WCHAR c ;
-#endif
 {
 char mb_c[32]; /* arbitrarily large */
 int  length;