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

cde/programs/dthelp/parser/pass2/parser/actutil.c

@@ -107,17 +107,7 @@ int m_findact(elt, array)
     }
 
 /* Recursive procedure called by findact() to search m_action */
-#if defined(M_PROTO)
 void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild)
-#else
-void m_findchain(stackptr, start, chainin, chainout, index, wild)
-  M_PARSE *stackptr;
-  int start;
-  int chainin;
-  int *chainout;
-  int *index;
-  LOGICAL wild;
-#endif
 {
     int node;
     M_PARSE *stackp;
@@ -241,14 +231,7 @@ void m_strtaction(m_elt)
     }
 
 /* Output a start-string or end-string */
-#if defined(M_PROTO)
 void m_textout(char *format, LOGICAL start, LOGICAL end)
-#else
-void m_textout(format, start, end)
-  char *format;
-  LOGICAL start;
-  LOGICAL end;
-#endif
 {
 M_WCHAR name[M_NAMELEN + 1];
 int i, par;

cde/programs/dthelp/parser/pass2/parser/cyclent.c

@@ -36,15 +36,7 @@
 #include "parser.h"
 #include "entext.h"
 
-#if defined(M_PROTO)
 M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, unsigned char *wheredef)
-#else
-M_WCHAR *m_cyclent(init, type, content, wheredef)
-  LOGICAL init ;
-  unsigned char *type ;
-  M_WCHAR **content ;
-  unsigned char *wheredef ;
-#endif
 {
     static M_TRIE *current ;
     static M_TRIE *ancestor[M_NAMELEN + 1] ;

cde/programs/dthelp/parser/pass2/parser/entity.c

@@ -43,13 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "entext.h"
 
 /* Process the name in a usemap delaration */
-#if defined(M_PROTO)
 void m_ckmap(M_WCHAR *name, LOGICAL useoradd)
-#else
-void m_ckmap(name, useoradd)
-  M_WCHAR *name ;
-  LOGICAL useoradd ;
-#endif
 {
     int mapid ;
 

cde/programs/dthelp/parser/pass2/parser/error.c

@@ -52,15 +52,9 @@ void m_error(text)
   }
 
 /* Issue error message (one argument) */
-#if defined(M_PROTO)
 void m_err1(
   const char    *text,
   const M_WCHAR *arg)
-#else
-void m_err1(text, arg)
-  char    *text;
-  M_WCHAR *arg;
-#endif
 {
 char *buffer, *mb_arg;
 
@@ -77,15 +71,9 @@ m_esuffix();
 }
 
 
-#if defined(M_PROTO)
 void m_mberr1(
   const char *text,
   const char *arg)
-#else
-void m_err1(text, arg)
-  char    *text;
-  char *arg;
-#endif
   {
   M_WCHAR *wc_arg;
 
@@ -95,17 +83,10 @@ void m_err1(text, arg)
   }
 
 /* Issue error message (two arguments) */
-#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;
-  M_WCHAR *arg2;
-#endif
   {
     char *buffer;
     char *mb_arg1,*mb_arg2;
@@ -126,19 +107,11 @@ void m_err2(text, arg1, arg2)
   }
 
 /* Issue error message (three arguments) */
-#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;
-  M_WCHAR *arg2;
-  M_WCHAR *arg3;
-#endif
   {
     char *buffer;
     char *mb_arg1, *mb_arg2, *mb_arg3;
@@ -164,21 +137,12 @@ void m_err3(text, arg1, arg2, arg3)
   }
 
 /* Issue error message (four arguments) */
-#if defined(M_PROTO)
 void m_err4(
   char    *text,
   M_WCHAR *arg1,
   M_WCHAR *arg2,
   M_WCHAR *arg3,
   M_WCHAR *arg4)
-#else
-void m_err4(text, arg1, arg2, arg3, arg4)
-  char    *text;
-  M_WCHAR *arg1;
-  M_WCHAR *arg2;
-  M_WCHAR *arg3;
-  M_WCHAR *arg4;
-#endif
   {
     char *buffer;
     char *mb_arg1, *mb_arg2,*mb_arg3,*mb_arg4;
@@ -207,7 +171,6 @@ void m_err4(text, arg1, arg2, arg3, arg4)
   }
 
 /* Issue error message (five arguments) */
-#if defined(M_PROTO)
 void m_err5(
   char    *text,
   M_WCHAR *arg1,
@@ -215,15 +178,6 @@ void m_err5(
   M_WCHAR *arg3,
   M_WCHAR *arg4,
   M_WCHAR *arg5)
-#else
-void m_err5(text, arg1, arg2, arg3, arg4, arg5)
-  char    *text;
-  M_WCHAR *arg1;
-  M_WCHAR *arg2;
-  M_WCHAR *arg3;
-  M_WCHAR *arg4;
-  M_WCHAR *arg5;
-#endif
   {
     char *buffer;
     char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5;
@@ -261,7 +215,6 @@ void m_err5(text, arg1, arg2, arg3, arg4, arg5)
   }
 
 /* Issue error message (six arguments) */
-#if defined(M_PROTO)
 void m_err6(
   char    *text,
   M_WCHAR *arg1,
@@ -270,16 +223,6 @@ void m_err6(
   M_WCHAR *arg4,
   M_WCHAR *arg5,
   M_WCHAR *arg6)
-#else
-void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6)
-  char    *text;
-  M_WCHAR *arg1;
-  M_WCHAR *arg2;
-  M_WCHAR *arg3;
-  M_WCHAR *arg4;
-  M_WCHAR *arg5;
-  M_WCHAR *arg6;
-#endif
   {
     char *buffer;
     char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6;
@@ -321,7 +264,6 @@ void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6)
   }
 
 /* Issue error message (seven arguments) */
-#if defined(M_PROTO)
 void m_err7(
   char    *text,
   M_WCHAR *arg1,
@@ -331,17 +273,6 @@ void m_err7(
   M_WCHAR *arg5,
   M_WCHAR *arg6,
   M_WCHAR *arg7)
-#else
-void m_err7(text, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
-  char    *text;
-  M_WCHAR *arg1;
-  M_WCHAR *arg2;
-  M_WCHAR *arg3;
-  M_WCHAR *arg4;
-  M_WCHAR *arg5;
-  M_WCHAR *arg6;
-  M_WCHAR *arg7;
-#endif
   {
     char *buffer;
     char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6, *mb_arg7;

cde/programs/dthelp/parser/pass2/parser/findpar.c

@@ -41,14 +41,7 @@
    Returns 0 if elt is not a valid element name, if param is specified
    but is not a valid parameter name, or if param is NULL and value is
    not a valid value of any of elt's parameters. */
-#if defined(M_PROTO)
 int m_findpar( const char *elt , const char *param , const M_WCHAR *value )
-#else
-int m_findpar(elt, param, value)
-char *elt ;
-char *param ;
-M_WCHAR *value ;
-#endif /* M_PROTO */
 {
 M_ELEMENT eltid ;
 int par ;

cde/programs/dthelp/parser/pass2/parser/param.c

@@ -290,13 +290,7 @@ void m_stkparams(M_NOPAR)
     }
 
 /* Update the default of a parameter whose default is #CURRENT */
-#if defined(M_PROTO)
 void m_updatedefault(const int par , const M_WCHAR *string )
-#else
-void m_updatedefault(par, string)
-  int par ;
-  M_WCHAR *string ;
-#endif /* M_PROTO */
   {
     if (m_parameter[par - 1].deftype != M_CURRENT &&
         m_parameter[par - 1].deftype != M_CHANGEDCUR) return ;

cde/programs/dthelp/parser/pass2/parser/parser.h

@@ -345,8 +345,6 @@ M_PAREXTERN int m_wsused ;
 /* Temporary pointers to parameter values.  Used while scanning start tag
    before element is placed on parse stack.*/
 M_PAREXTERN
-#if defined M_PROTO
-#endif
 M_WCHAR *m_poccur[
 #if defined(M_PARDEF)
 M_MAXPAR ? M_MAXPAR : 1

cde/programs/dthelp/parser/pass2/parser/parvalok.c

@@ -34,14 +34,7 @@
 /* Function callable by interface designers.  Returns TRUE if specified value
    is a legal value for the indicated parameter of the given element,
    FALSE otherwise. */
-#if defined(M_PROTO)
 LOGICAL m_parvalok( M_WCHAR *elt , M_WCHAR *param , const M_WCHAR *value )
-#else
-LOGICAL m_parvalok(elt, param, value)
-  M_WCHAR *elt ;
-  M_WCHAR *param ;
-  M_WCHAR *value ;
-#endif /* M_PROTO */
   {
     M_ELEMENT eltid ;
     int par ;

cde/programs/dthelp/parser/pass2/parser/scan.c

@@ -402,12 +402,7 @@ int m_getachar(dchar)
     }
 
 /* Reads a name token */
-#if defined(M_PROTO)
 void m_getname(M_WCHAR first)
-#else
-void m_getname(first)
-  M_WCHAR first ;
-#endif
 {
     M_WCHAR *p ;
     M_HOLDTYPE dchar ;
@@ -649,14 +644,7 @@ void m_litproc(delim)
     }
 
 /* Called when a missing tagc delimiter is detected */
-#if defined(M_PROTO)
 void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start)
-#else
-void m_missingtagc(c, dchar, start)
-  int c ;
-  M_HOLDTYPE dchar ;
-  LOGICAL start ;
-#endif
 {
     if (! m_wholetag) {
       if (start) m_mberr1("Invalid parameter or missing %s", m_tagc);
@@ -669,18 +657,8 @@ void m_missingtagc(c, dchar, start)
 
 /* Have found one character in a possible short reference delimiter.
    Prepare to look for the next one */
-#if defined(M_PROTO)
 void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart,
 		     LOGICAL skipblank, unsigned char type)
-#else
-void m_nextdelimchar(n, i, linestart, newlinestart, skipblank, type)
-  int *n ;
-  int i ;
-  LOGICAL *linestart ;
-  LOGICAL newlinestart ;
-  LOGICAL skipblank ;
-  unsigned char type ;
-#endif
 {               
     int k ;
     char mb_re,mb_seqchar, mb_rschar;
@@ -863,13 +841,7 @@ int m_scan(M_NOPAR)
 
 
 /* Process explicit or implied USEMAP or ADDMAP */
-#if defined(M_PROTO)
 void m_setmap(int map, LOGICAL useoradd)
-#else
-void m_setmap(map, useoradd)
-  int map ;
-  LOGICAL useoradd ;
-#endif
 {
     int i ;
     int sref ;
@@ -1087,13 +1059,7 @@ void m_sigre(M_NOPAR)
 
 /* Returns a context-dependent delimiter string to input stream so
    characters can be reread one at a time in another context */
-#if defined(M_PROTO)
 void m_undodelim(M_WCHAR *delim, LOGICAL flag)
-#else
-void m_undodelim(delim, flag)
-  M_WCHAR *delim ;
-  LOGICAL flag ;
-#endif
 {
     M_WCHAR *p ;
 
@@ -1110,14 +1076,7 @@ void m_undodelim(delim, flag)
 /* Place a character on the current input stream.  The character may have
    been scanned and determined not to be part of the current token or it
    may be in the expansion of an entity*/
-#if defined(M_PROTO)
 void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread)
-#else
-void m_ungetachar(c, dchar, preread)
-  int c ;
-  M_HOLDTYPE dchar ;
-  LOGICAL preread ;
-#endif
 {
     char buffer[10] ;
     int length;

cde/programs/dthelp/parser/pass2/parser/string.c

@@ -31,14 +31,7 @@
 /* Include generated code */
 #include "stfile.c"
 
-#if defined(M_PROTO)
 void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END)
-#else
-void m_stcaction(m_string, M_START, M_END)
-  M_WCHAR *m_string ;
-  LOGICAL M_START ;
-  LOGICAL M_END ;
-#endif
 {
     m_stackpar = m_stacktop->stparam ;
     (*m_sttable[m_stacktop->stccase])(m_string, M_START, M_END) ;

cde/programs/dthelp/parser/pass2/parser/struct.c

@@ -88,13 +88,7 @@ int m_checkstart(val)
    If VAL is not the element at the top of the parse stack, m_ckend
    checks to see if the end of VAL can validly end nested
    elements as well. */
-#if defined(M_PROTO)
 LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet)
-#else
-LOGICAL m_ckend(val, neednet)
-  M_ELEMENT val ;
-  LOGICAL neednet ;
-  #endif
 {
     M_PARSE *stackptr ;
     M_OPENFSA *fsastack ;
@@ -426,14 +420,7 @@ void m_pop(M_NOPAR)
 
 /* Pushes a new item onto the parse stack, setting its element, current,
    and neednet fields as indicated by the parameters*/
-#if defined(M_PROTO)
 void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need)
-#else
-void m_push(elt, current, need)
-  M_ELEMENT elt ;
-  M_STATE current ;
-  LOGICAL need ;
-  #endif
 {
     M_PARSE *newstack ;
 
@@ -654,13 +641,7 @@ LOGICAL m_strtproc(scanval)
     }
 
 /* Processes explicit or implied start tag*/
-#if defined(M_PROTO)
 void m_strttag(M_ELEMENT val, LOGICAL net)
-#else
-void m_strttag(val, net)
-  M_ELEMENT val ;
-  LOGICAL net ;
-#endif
 {
     m_transition(val, TRUE) ;
     if (val) {
@@ -726,13 +707,7 @@ LOGICAL m_textpermitted(M_NOPAR)
 /* Returns TRUE iff LABEL allowed in the current state of the current
    element (without expanding any minimization).  May result in changes
    to the stack of FSA's for this element if and-groups open or close. */
-#if defined(M_PROTO)
 LOGICAL m_transition(M_ELEMENT label, LOGICAL recur)
-#else
-LOGICAL m_transition(label, recur)
-  M_ELEMENT label ;
-  LOGICAL recur ;
-#endif
 {
     M_ARC parc ;
     M_OPENFSA *newfsa ;

cde/programs/dthelp/parser/pass2/parser/text.c

@@ -38,12 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #define M_BUFLEN (32)
 
 /* When a text character occurs */
-#if defined(M_PROTO)
 void m_textaction(M_WCHAR m_textchar)
-#else
-void m_textaction(m_textchar)
-  M_WCHAR m_textchar ;
-  #endif
 {
     char buffer[M_BUFLEN] ;
     char    mb_re;