dthelp: Remove always on macro M_NOPAR which was just there to support ancient compilers that don't have 'void'

cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c

@@ -62,7 +62,7 @@ if (*flag)
 }
 
 /* Program initialization */
-void initialize(M_NOPAR)
+void initialize(void)
 {
 char    **mb_delims;
 M_WCHAR **wc_delims;
@@ -90,7 +90,7 @@ ruleinit() ;
 
 
 /* Initialization before starting a new rule */
-void ruleinit(M_NOPAR)
+void ruleinit(void)
   {
     /* Reinitialize for next rule */
     lhs = NULL ;
@@ -110,7 +110,7 @@ void ruleinit(M_NOPAR)
     }
 
 /* Rule end processing */
-void rulend(M_NOPAR)
+void rulend(void)
   {
     STATE *fsa ;
     LOGICAL canbenull ;
@@ -150,7 +150,7 @@ void rulend(M_NOPAR)
     }
 
 /* Skip rest of statement after an error */
-void skiptoend(M_NOPAR)
+void skiptoend(void)
   {
     int i ;
     static errlev = 0 ;

cde/programs/dthelp/parser.ccdf/htag/build/except.c

@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "build.h"
 
 /* Add an exception (inclusion or exclusion) for the current element */
-void addex(M_NOPAR)
+void addex(void)
   {
     excount++ ;
     *nextex = (EXCEPTION *) m_malloc(sizeof(EXCEPTION), "exception") ;

cde/programs/dthelp/parser.ccdf/htag/build/fsa.c

@@ -176,7 +176,7 @@ void dellist(list)
 
 /* Delstartarcs deletes the contents of the starta list of arcs from start
    states of a submodel */
-void delstartarcs(M_NOPAR)
+void delstartarcs(void)
   {
     ARC *arcptr ;
     ARC *discard ;
@@ -190,7 +190,7 @@ void delstartarcs(M_NOPAR)
     }
 
 /* Getand allocates and initializes a new andgroup structure */
-ANDGROUP *getand(M_NOPAR)
+ANDGROUP *getand(void)
   {
     ANDGROUP *new ;
 
@@ -203,7 +203,7 @@ ANDGROUP *getand(M_NOPAR)
     }    
 
 /* Getstate obtains an FSA state */
-STATE *getstate(M_NOPAR)
+STATE *getstate(void)
   {
     STATE *new ;
 
@@ -477,7 +477,7 @@ LOGICAL permitspcd(a)
 
 /* Pop pops the submodel stack when the end of the current submodel is
    encountered */
-void pop(M_NOPAR)
+void pop(void)
   {
     STACK *discard ;
 
@@ -493,7 +493,7 @@ void pop(M_NOPAR)
     }
 
 /* Push pushes the submodel stack when a new group is encountered */
-void push(M_NOPAR)
+void push(void)
   {
     STACK *new ;
 
@@ -647,7 +647,7 @@ void savelhs(LOGICAL param)
 /* Called when arcs are added to the start state of a submodel that is
    also a start state of the parent model to set the parent model's
    starta list */
-void savestartarcs(M_NOPAR)
+void savestartarcs(void)
   {
     ARC *carcptr, *parcptr ;
 

cde/programs/dthelp/parser.ccdf/htag/build/out.c

@@ -86,7 +86,7 @@ char *deftype(n)
     }
 
 /* Called after all input is read to generate output */
-void done(M_NOPAR)
+void done(void)
   {
 
     if (! eltree.data) {
@@ -166,7 +166,7 @@ void eltblocks(tempfile)
 
 
 /* Writes data about elements */
-void eltreeout(M_NOPAR)
+void eltreeout(void)
   {
     M_WCHAR *p ;
     int enameindex = 0 ;
@@ -244,7 +244,7 @@ char *enttype(n)
     }
 
 /* Outputs exception lists */
-void exout(M_NOPAR)
+void exout(void)
   {
     EXCEPTION *ex ;
     int exindex = 0 ;
@@ -267,7 +267,7 @@ void exout(M_NOPAR)
     }
 
 /* Outputs FSA definitions */
-void fsa(M_NOPAR)
+void fsa(void)
   {
     int arcount = 0 ;
     STATE *pstate ;
@@ -330,7 +330,7 @@ void fsa(M_NOPAR)
     }
 
 /* Writes data about parameters */
-void parout(M_NOPAR)
+void parout(void)
 {
 PARAMETER *paramp ;
 LOGICAL first = TRUE ;
@@ -479,7 +479,7 @@ char *partype(n)
     }
 
 /* Write short reference information */
-void srefout(M_NOPAR)
+void srefout(void)
   {
     LOGICAL first = TRUE ;
     int *mapbysref ;
@@ -626,7 +626,7 @@ fputs("  <END-STRING><\\END-STRING>\n", tempfile) ;
 }
 
 /* Write template */
-void template(M_NOPAR)
+void template(void)
   {
     FILE *tempfile ;
     M_ENTITY *ent ;

cde/programs/dthelp/parser.ccdf/htag/build/param.c

@@ -38,7 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Add a keyword to the list of possible values of a keyword parameter for
    the current element
 */
-void addkeyword(M_NOPAR)
+void addkeyword(void)
 {
 int length ;
 PARAMETER *par ;
@@ -87,7 +87,7 @@ ptypelen++ ;
 }
 
 /* Add a parameter to the current element */
-void addpar(M_NOPAR)
+void addpar(void)
 {
 PARAMETER *paramp, *last ;
 int length ;
@@ -259,7 +259,7 @@ switch (newpar->type)
 }
 
 /* Called at end of parameter attribute list rule */
-void prulend(M_NOPAR)
+void prulend(void)
 {
 LHS *lhsp ;
 LHS *discard ;

cde/programs/dthelp/parser.ccdf/htag/build/proto.h

@@ -36,15 +36,15 @@ void adddefent(M_WCHAR *mapname);
 
 LOGICAL addent(M_WCHAR *name);
 
-void addex(M_NOPAR);
+void addex(void);
 
-void addkeyword(M_NOPAR);
+void addkeyword(void);
 
 LOGICAL addmapname(M_WCHAR *p, LOGICAL define);
 
 void addndent(M_WCHAR *p);
 
-void addpar(M_NOPAR);
+void addpar(void);
 
 void addsref(M_WCHAR *p);
 
@@ -63,15 +63,15 @@ void copyintolist(STATELIST *from, STATELIST **to);
 
 void countdown(M_TRIE *parent, int *count);
 
-void defmapname(M_NOPAR);
+void defmapname(void);
 
 char *deftype(int n);
 
 void dellist(STATELIST **list);
 
-void delstartarcs(M_NOPAR);
+void delstartarcs(void);
 
-void done(M_NOPAR);
+void done(void);
 
 void dumpentnode(FILE *file, M_TRIE *value);
 
@@ -91,9 +91,9 @@ void m_dumptrie(FILE   *file,
 
 void eltblocks(FILE *tempfile);
 
-void eltreeout(M_NOPAR);
+void eltreeout(void);
 
-void endmodel(M_NOPAR);
+void endmodel(void);
 
 void entout(char *fname);
 
@@ -107,7 +107,7 @@ void m_mberr1(char *text, const char *arg);
 
 void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
 
-void exout(M_NOPAR);
+void exout(void);
 
 void m_free(void *block, char *msg);
 
@@ -115,23 +115,23 @@ void freetree(TREE *ruletree);
 
 void found(LOGICAL *flag, char *delim);
 
-void fsa(M_NOPAR);
+void fsa(void);
 
-int getachar(M_NOPAR);
+int getachar(void);
 
-ANDGROUP *getand(M_NOPAR);
+ANDGROUP *getand(void);
 
 LOGICAL getname(int first);
 
-STATE *getstate(M_NOPAR);
+STATE *getstate(void);
 
 int gettoken(int *c, int context);
 
-TREE *gettreenode(M_NOPAR);
+TREE *gettreenode(void);
 
-void m_initctype(M_NOPAR);
+void m_initctype(void);
 
-void initialize(M_NOPAR);
+void initialize(void);
 
 LOGICAL litproc(int delim);
 
@@ -161,49 +161,49 @@ ELTSTRUCT *ntrelt(M_WCHAR *p);
 
 void m_openchk(FILE **ptr, char *name, char *mode);
 
-void parout(M_NOPAR);
+void parout(void);
 
 char *partype(int n);
 
 LOGICAL permitspcd(ARC *a);
 
-void pop(M_NOPAR);
+void pop(void);
 
-void prulend(M_NOPAR);
+void prulend(void);
 
-void push(M_NOPAR);
+void push(void);
 
 LOGICAL regenerate(TREE *start, TREE *stop);
 
 void repeat(TREE *root);
 
-void ruleinit(M_NOPAR);
+void ruleinit(void);
 
-void rulend(M_NOPAR);
+void rulend(void);
 
 LOGICAL samelabelarc(ARC *a, STATE *s);
 
 void savelhs(LOGICAL param);
 
-void savestartarcs(M_NOPAR);
+void savestartarcs(void);
 
-int scan(M_NOPAR);
+int scan(void);
 
 void setdefault(const M_WCHAR *string);
 
 void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 int m_sprscon(int i, int j);
 
-void srefout(M_NOPAR);
+void srefout(void);
 
 STATE *startfsa(TREE *root, LOGICAL *canbenull);
 
 void tempelt(ELTSTRUCT *eltp, FILE *tempfile);
 
-void template(M_NOPAR);
+void template(void);
 
 char *typecon(int n);
 

cde/programs/dthelp/parser.ccdf/htag/build/scan.c

@@ -74,7 +74,7 @@ return(TRUE);
 }
 
 /* Returns the next token to the main procedure */
-int scan(M_NOPAR)
+int scan(void)
 {
 int c;
 int n;

cde/programs/dthelp/parser.ccdf/htag/build/sref.c

@@ -191,7 +191,7 @@ delim->data = thissref;
 
 /* Prefix left-hand side with "M-" to create default short reference map
    name, truncating to M_NAMELEN characters if necessary */
-void defmapname(M_NOPAR)
+void defmapname(void)
 {
 if (!wc_prefix)
     {

cde/programs/dthelp/parser.ccdf/htag/build/tree.c

@@ -36,7 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Called after a right parenthesis is read while scanning a content model.
    Resets curcon if it is the outermost submodel. */
-void endmodel(M_NOPAR)
+void endmodel(void)
   {
     curtree = curtree->parent ;
     if (! curtree->parent) curcon = LASTM ;
@@ -58,7 +58,7 @@ void freetree(treep)
     }
 
 /* Gettreenode obtains a node to use in the tree representation of a rule */
-TREE *gettreenode(M_NOPAR)
+TREE *gettreenode(void)
   {
     TREE *new ;
 

cde/programs/dthelp/parser.ccdf/htag/eltdef/context.dat

@@ -398,7 +398,7 @@ tagc
   postent:start
   codetagc:inentc {
             startcode(entity->codeindex, &inent, entfile,
-                      "c", nopar, nopar, "") ;
+                      "c", "void", "void", "") ;
             }
   close:preparam
   sschain:inss {
@@ -420,11 +420,11 @@ tagc
             }
   scchain:insc {
             *getaction(scarray) = ++sactions ;
-            startcode(sactions, &insc, sfile, "s", nopar, nopar, "") ;
+            startcode(sactions, &insc, sfile, "s", "void", "void", "") ;
             }
   ecchain:inec {
             *getaction(ecarray) = ++eactions ;
-            startcode(eactions, &inec, efile, "e", nopar, nopar, "") ;
+            startcode(eactions, &inec, efile, "e", "void", "void", "") ;
             }
   stcchain:instc {
             *getaction(stcarray) = ++stactions ;

cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.h

@@ -215,7 +215,6 @@ ELTEXTERN int restart ELTINIT(RENTITY) ;
 #define stproto "M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END"
 #define stformal "m_string, M_START, M_END"
 #define stft "  M_WCHAR *m_string ;\n  LOGICAL M_START ;\n  LOGICAL M_END ;\n"
-#define nopar "M_NOPAR"
 
 /* Structures for generating defines for parameter values */
 ELTEXTERN M_TRIE parval ;

cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c

@@ -92,7 +92,7 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto)
 
 /* Called when the C identifier to be #define'd to a parameter value is
    scanned */
-void cvalue(M_NOPAR)
+void cvalue(void)
   {
     PARVAL *new;
 
@@ -111,18 +111,18 @@ void cvalue(M_NOPAR)
 
 /* Called after last input character is read to place closing punctuation
    at end of output files and close them */
-void done(M_NOPAR)
+void done(void)
   {
     M_ENTITY *ent;
     ACTION *actp;
     LOGICAL first;
     int i;
 
-    closeiffile(inent, entfile, codeent, "c", nopar);
+    closeiffile(inent, entfile, codeent, "c", "void");
     closeiffile(intext, tfile, tactions, "t", tproto);
     closeiffile(inpc, pfile, pactions, "p", pproto);
-    closeiffile(insc, sfile, sactions, "s", nopar);
+    closeiffile(insc, sfile, sactions, "s", "void");
-    closeiffile(inec, efile, eactions, "e", nopar);
+    closeiffile(inec, efile, eactions, "e", "void");
     closeiffile(instc, stfile, stactions, "st", stproto);
 
     endstring();
@@ -190,7 +190,7 @@ void endcode(LOGICAL flag, FILE *file)
     }
 
 /* Called at the end of all initial fields in the interface definition */
-void endini(M_NOPAR)
+void endini(void)
   {
     if (finitext) 
       fputs("    putc(m_textchar, m_outfile);\n", tfile);
@@ -209,7 +209,7 @@ void endini(M_NOPAR)
 
 /* End the sign-on message */
 #include <time.h>
-void endsignon(M_NOPAR)
+void endsignon(void)
   {
     long storetime;
     char *p;
@@ -255,7 +255,7 @@ void endsignon(M_NOPAR)
     }
 
 /* Closes a start-string or end-string */
-void endstring(M_NOPAR)
+void endstring(void)
   {
     if (instring) {
       if (stringstart) stringstart = FALSE;
@@ -282,7 +282,7 @@ void enttype(type)
     }
 
 /* Free storage used for a context-specification chain */
-void freechain(M_NOPAR)
+void freechain(void)
   {
     CHAIN *chainp, *dchainp;
 
@@ -333,7 +333,7 @@ int *getaction(array)
     }
 
 /* Allocate new action structure */
-ACTION *getactstruct(M_NOPAR)
+ACTION *getactstruct(void)
   {
     ACTION *new;
 
@@ -347,7 +347,7 @@ ACTION *getactstruct(M_NOPAR)
     }
 
 /* Program initialization */
-void initialize(M_NOPAR)
+void initialize(void)
 {
 char    **mb_delims;
 M_WCHAR **wc_delims;
@@ -411,13 +411,13 @@ fputs("#endif\n", ifh);
 
 startcode(pactions, &inpc, pfile, "p", pproto, pformal, pftype);
 startcode(tactions, &intext, tfile, "t", tproto, tformal, tftype);
-startcode(sactions, &insc, sfile, "s", nopar, nopar, "");
+startcode(sactions, &insc, sfile, "s", "void", "void", "");
-startcode(eactions, &inec, efile, "e", nopar, nopar, "");
+startcode(eactions, &inec, efile, "e", "void", "void", "");
 startcode(stactions, &instc, stfile, "st", stproto, stformal, stft);
 }
 
 /* Output definitions for strings */
-void outstring(M_NOPAR)
+void outstring(void)
   {
     int c;
 
@@ -480,7 +480,7 @@ for ( ; p ; p = p->next)
 }
 
 /* Skip rest of statement after an error */
-void skiptoend(M_NOPAR)
+void skiptoend(void)
   {
     int i;
     static errlev = 0;
@@ -581,7 +581,7 @@ fprintf(file, "{\n/* line %d \"%s\" */\n", m_line, iffile); /* balance "}" */
 }
 
 /* Begins processing a new element */
-void startelement(M_NOPAR)
+void startelement(void)
   {
     CVARSTRUCT *cvarp;
     CVARSTRUCT *discard;
@@ -602,7 +602,7 @@ void startelement(M_NOPAR)
     }
 
 /* Stores the name of a C variable read from the input file */
-void storecvar(M_NOPAR)
+void storecvar(void)
   {
     CVARSTRUCT *new;
 
@@ -617,7 +617,7 @@ void storecvar(M_NOPAR)
 /* Compares the parameter name associated with a C variable in the input
    file with the names of all parameters of the current element.  Stores
    result for later output with code segments */
-void storepname(M_NOPAR)
+void storepname(void)
   {
     int i, par;
 

cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c

@@ -35,7 +35,7 @@
 #include "entext.h"
 
 /* Add an entity */
-void addent(M_NOPAR)
+void addent(void)
   {
     M_ENTITY *new ;
 

cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h

@@ -30,7 +30,7 @@
 
 void actptrout(ACTION **array, char *name);
 
-void addent(M_NOPAR);
+void addent(void);
 
 LOGICAL m_allwhite(const M_WCHAR *string);
 
@@ -38,19 +38,19 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto);
 
 void countdown(M_TRIE *parent, int *count);
 
-void cvalue(M_NOPAR);
+void cvalue(void);
 
-void done(M_NOPAR);
+void done(void);
 
 void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, void (*proc)(M_ENTITY *));
 
 void endcode(LOGICAL flag, FILE *file);
 
-void endini(M_NOPAR);
+void endini(void);
 
-void endsignon(M_NOPAR);
+void endsignon(void);
 
-void endstring(M_NOPAR);
+void endstring(void);
 
 void entout(char *fname);
 
@@ -72,21 +72,21 @@ void m_exit(int status);
 
 void m_free(void *block, char *msg);
 
-void freechain(M_NOPAR);
+void freechain(void);
 
-int getachar(M_NOPAR);
+int getachar(void);
 
 int *getaction(ACTION **array);
 
-ACTION *getactstruct(M_NOPAR);
+ACTION *getactstruct(void);
 
 void getname(int first);
 
 int gettoken(int *c, int context);
 
-void m_initctype(M_NOPAR);
+void m_initctype(void);
 
-void initialize(M_NOPAR);
+void initialize(void);
 
 LOGICAL m_letter(M_WCHAR c);
 
@@ -100,24 +100,24 @@ void m_openchk(FILE **ptr, char *name, char *mode);
 
 void outpval(M_TRIE *p);
 
-void outstring(M_NOPAR);
+void outstring(void);
 
 int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name);
 
 const M_WCHAR *m_partype(const int par, const M_WCHAR *string);
 
-int scan(M_NOPAR);
+int scan(void);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto,
   char *formal, char *formtype);
 
-void startelement(M_NOPAR);
+void startelement(void);
 
-void storecvar(M_NOPAR);
+void storecvar(void);
 
-void storepname(M_NOPAR);
+void storepname(void);
 
 void undodelim(M_WCHAR *delim);
 

cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c

@@ -85,7 +85,7 @@ ungetachar(c);
 }
 
 /* Reads the next token and returns it to the main procedure */
-int scan(M_NOPAR)
+int scan(void)
 {
 int c;
 int n;

cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c

@@ -37,7 +37,7 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co.
 /* 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(M_NOPAR);
+void _setenvp(void);
 void _setenvp(){}
 #endif
 
@@ -72,7 +72,7 @@ else
 }
 
 /* Write error message prefix */
-void m_eprefix(M_NOPAR)
+void m_eprefix(void)
 {
 m_errline("\n*****\n");
 m_dumpline(m_thisfile(), m_thisline());
@@ -96,7 +96,7 @@ for ( ; *p ; p++)
 #include <process.h>
 #endif
 /* Write error message suffix */
-void m_esuffix(M_NOPAR)
+void m_esuffix(void)
 {
 m_errline(":\n");
 m_lastchars();
@@ -245,7 +245,7 @@ return(NULL);
 }
 
 /* Open input file */
-void *m_openfirst(M_NOPAR)
+void *m_openfirst(void)
 {
 FILE *first;
 char *input;

cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h

@@ -26,18 +26,18 @@
 
 void appstart(M_WCHAR *id, M_WCHAR *letter);
 
-void assert_hometopic_exists(M_NOPAR);
+void assert_hometopic_exists(void);
 
 void badgraphic(int filestat);
 
-void basename(M_NOPAR);
+void basename(void);
 
 void calcdisp (M_WCHAR *file, M_WCHAR *startrow, M_WCHAR *endrow,
   M_WCHAR *clip, M_WCHAR *margin);
 
-void callndbeg (M_NOPAR);
+void callndbeg (void);
 
-void callndend (M_NOPAR);
+void callndend (void);
 
 /* used by ccompspec(), cmenlspec(), and cwmenlspec() */
 char *ccharspec(M_WCHAR textchar);
@@ -61,11 +61,11 @@ M_WCHAR *mb_checkdimen(M_WCHAR *val, char *paramname, char *elt);
 
 M_WCHAR *checkent(M_WCHAR *entcontent);
 
-void checkgloss(M_NOPAR);
+void checkgloss(void);
 
 M_WCHAR *checkid(M_WCHAR *id);
 
-void checkmsghead (M_NOPAR);
+void checkmsghead (void);
 
 M_WCHAR *checkreal (M_WCHAR *val, M_WCHAR *paramname, LOGICAL msgout, M_WCHAR *elt);
 
@@ -91,17 +91,17 @@ void cwmloutchar(M_WCHAR textchar, FILE *outfile);
 
 void defxref(FILE *xfile, M_WCHAR *id, struct xref *xref);
 
-int do_esc_seq(M_NOPAR);
+int do_esc_seq(void);
 
-void dumpxref(M_NOPAR);
+void dumpxref(void);
 
 void echohead(M_WCHAR *p);
 
 void mb_echohead(char *p);
 
-void endhead(M_NOPAR);
+void endhead(void);
 
-void endhelpnode(M_NOPAR);
+void endhelpnode(void);
 
 void esoutchar(M_WCHAR textchar);
 
@@ -163,7 +163,7 @@ void itoletter(int n, char start, char *dest, int length);
 
 LOGICAL m_letter(M_WCHAR c);
 
-void loadxref(M_NOPAR);
+void loadxref(void);
 
 int m_lower(int c);
 
@@ -179,7 +179,7 @@ void onlygraphic(char    *param,    M_WCHAR *magnify, M_WCHAR *video,     M_WCHA
   M_WCHAR *margin,   M_WCHAR *clip,    M_WCHAR *penwidth,  M_WCHAR *autoscale,
   M_WCHAR *plottype, M_WCHAR *hadjust, M_WCHAR *vadjust);
 
-void open_new_helpfile(M_NOPAR);
+void open_new_helpfile(void);
 		       
 void notallow(char *param1, char *param2);
 
@@ -191,11 +191,11 @@ void outchar(M_WCHAR textchar, FILE *outfile);
 
 void outpi(int enttype, M_WCHAR *pi, M_WCHAR *entname);
 
-void parspace(M_NOPAR);
+void parspace(void);
 
 LOGICAL pushndok(LOGICAL val);
 
-LOGICAL popndok(M_NOPAR);
+LOGICAL popndok(void);
 
 void prfigborder(int val);
 
@@ -223,9 +223,9 @@ void realoutchar(M_WCHAR textchar, FILE *outfile);
 
 void rsectstart(M_WCHAR *id, M_WCHAR *pagebreak);
 
-void rseqend(M_NOPAR);
+void rseqend(void);
 
-void rshnewclear(M_NOPAR);
+void rshnewclear(void);
 
 M_WCHAR *searchforfile(M_WCHAR *file);
 
@@ -294,7 +294,7 @@ void svhdstring(M_WCHAR *string);
 
 void svtcstring(M_WCHAR *string);
 
-void taboutre(M_NOPAR);
+void taboutre(void);
 
 void termchar(M_WCHAR textchar);
 
@@ -302,7 +302,7 @@ void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname);
 
 void testindexfile(FILE *first);
 
-void texinit(M_NOPAR);
+void texinit(void);
 
 void unimp(M_WCHAR *eltname);
 
@@ -336,11 +336,11 @@ double mb_usertopt(char *s);
 
 long usertosp(char *s);
 
-void whereneedused(M_NOPAR);
+void whereneedused(void);
 
 void t_addnotes(M_WCHAR *tnoteid);
 
-void t_prntnotes(M_NOPAR);
+void t_prntnotes(void);
 
 LOGICAL t_want_a_Q(int span_count);   
 
@@ -349,21 +349,21 @@ void t_xrefnotes(M_WCHAR *tnoteid);
 
 int t_getnum(char *s);
 
-void t_insertcellmarkup(M_NOPAR);
+void t_insertcellmarkup(void);
 
-void t_newpage(M_NOPAR);
+void t_newpage(void);
 
-void t_startcolh(M_NOPAR);
+void t_startcolh(void);
 
-void t_start_tabhead_colh(M_NOPAR);
+void t_start_tabhead_colh(void);
 
-void t_nextcell(M_NOPAR);
+void t_nextcell(void);
 
-void t_checkcaption(M_NOPAR);
+void t_checkcaption(void);
 
-void t_preamble(M_NOPAR);
+void t_preamble(void);
 
-void t_getstyle(M_NOPAR);
+void t_getstyle(void);
 
 void t_dospan(LOGICAL in_colh);
 
@@ -371,7 +371,7 @@ void t_startcell(M_WCHAR *span, M_WCHAR *vspan, char *msg);
 
 void t_endcell(M_WCHAR *span, M_WCHAR *vspan);
 
-void t_startrow(M_NOPAR);
+void t_startrow(void);
 
 void t_endrow(M_WCHAR *taglevone);
 
@@ -382,11 +382,11 @@ void t_tabstart(M_WCHAR *style, M_WCHAR *id, M_WCHAR *number, M_WCHAR *box, M_WC
   M_WCHAR *spacing, M_WCHAR *width, M_WCHAR *position, 
   M_WCHAR *tonumber, M_WCHAR *divide, M_WCHAR *textsize);
 
-void t_tablebody(M_NOPAR);
+void t_tablebody(void);
 
-void t_sendout_rowrule(M_NOPAR);
+void t_sendout_rowrule(void);
 
-void showmemavail(M_NOPAR);
+void showmemavail(void);
 
 int m_upper(int c);
 
@@ -395,7 +395,7 @@ char *GetDefaultHeaderString(char          *elementName,
   char          *defaultString);
 
 
-void SetDefaultLocale(M_NOPAR);
+void SetDefaultLocale(void);
 
 char *MakeMByteString(const M_WCHAR *from);
 

cde/programs/dthelp/parser.ccdf/htag/helptag/help.c

@@ -95,7 +95,7 @@ tableno = 0;
 footnoteno = 1;
 }
 
-void assert_hometopic_exists(M_NOPAR)
+void assert_hometopic_exists(void)
 {
 char *string =
     GetDefaultHeaderString("UntitledElementDefaultHeadingString",
@@ -123,7 +123,7 @@ m_free(string, "GetDefaultHeaderString return");
 
 /* Determine base name for files (i.e., input name without extension).
    Open output and error files */
-void basename(M_NOPAR)
+void basename(void)
   {
     char *p, *q;
     int n;
@@ -816,7 +816,7 @@ return(NULL);
 
 /* Called at end of manual to report terms that occurred in the document
    but not entered in the glossary */
-void checkgloss(M_NOPAR)
+void checkgloss(void)
 {
 int n;
 M_WCHAR id[MAXTERM + 1];
@@ -853,7 +853,7 @@ while (TRUE)
 		
 /* End Error _DtMessage macro \starterrmsg call, check to see if Error _DtMessage
    head is user specified or default */
-void checkmsghead(M_NOPAR)
+void checkmsghead(void)
 {
 char *string =
     GetDefaultHeaderString("MessagesElementDefaultHeadingString",
@@ -920,7 +920,7 @@ return ( valid );
 
 
 /* end a help node */
-void endhelpnode(M_NOPAR)
+void endhelpnode(void)
 {
 }
 
@@ -1735,7 +1735,7 @@ chapst = TRUE;
 
 /* Called at the end of a chapter, appendix, or section to end an open
    sequence of rsects */
-void rseqend(M_NOPAR)
+void rseqend(void)
 {
 if (rsectseq)
     {
@@ -1748,7 +1748,7 @@ if (rsectseq)
    sequence is not immediately followed by a new <rsect>.  Hence can output
    the \newpage macro call without concern about side effects on the
    page header */
-void rshnewclear(M_NOPAR)
+void rshnewclear(void)
 {
 if (rsectholdnew)
     {
@@ -1802,7 +1802,7 @@ return(NULL);
 
 
 /* show how much memory is available */
-void showmemavail(M_NOPAR)
+void showmemavail(void)
 {
 int amount=0;
 char *p;
@@ -2105,7 +2105,7 @@ m_entdupchk = FALSE;
 }
 
 /* Open and initialize TeX file */
-void texinit(M_NOPAR)
+void texinit(void)
 {
 LOGICAL init = TRUE;
 unsigned char type;

cde/programs/dthelp/parser.ccdf/htag/helptag/out.c

@@ -57,7 +57,7 @@ m_free(wc,"wide character string");
 
 /* Called at end of a head in a chapter, appendix, section, or
    reference section */
-void endhead(M_NOPAR)
+void endhead(void)
 {
 if (savid)
     {
@@ -229,7 +229,7 @@ if (echo)
 }
 
 /* Called for normal paragraph spacing */
-void parspace(M_NOPAR)
+void parspace(void)
 {
 if (unleaded)  /* unleaded is a one-shot flag */
     unleaded = FALSE;

cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c

@@ -143,7 +143,7 @@ m_free(csname, "csname");
 
 /* Write cross-reference file for next time document is processed
    and TeX macro file for post-processing this pass */
-void dumpxref(M_NOPAR)
+void dumpxref(void)
 {
 int n;
 M_WCHAR id[M_NAMELEN + 1];
@@ -213,7 +213,7 @@ xstrlen += length;
 
 /* Initializes cross-reference table reading in file output from previous
    pass through document */
-void loadxref(M_NOPAR)
+void loadxref(void)
 {
 M_WCHAR id[M_NAMELEN + 1];
 char c, d;

cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c

@@ -137,7 +137,7 @@ void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *
 /* Process global end string.  In separate procedure to keep all references
    to if.h in one source file and minimize recompilation if interface
    changes. */
-void m_globes(M_NOPAR)
+void m_globes(void)
 {
 M_WCHAR *wc_string;
 
@@ -149,7 +149,7 @@ m_free(wc_string,"wide character string");
 /* Process global start string.  In separate procedure to keep all references
    to if.h in one source file and minimize recompilation if interface
    changes. */
-void m_globss(M_NOPAR)
+void m_globss(void)
 {
 M_WCHAR *wc_string;
 

cde/programs/dthelp/parser.ccdf/htag/parser/eprefix.c

@@ -29,7 +29,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 #include "globdec.h"
 
 /* Write error message prefix */
-void m_eprefix(M_NOPAR)
+void m_eprefix(void)
   {
     m_errline("\n*****\n") ;
     }

cde/programs/dthelp/parser.ccdf/htag/parser/error.c

@@ -336,7 +336,7 @@ void m_getline(file, line)
 
 /* Dump last characters read from input stream to give context to
    an error message */
-void m_lastchars(M_NOPAR)
+void m_lastchars(void)
 {
 int i;
 M_WCHAR buffer[2];
@@ -385,14 +385,14 @@ if ((m_svlncnt[m_sysecnt] &&
 }
 
 /* Display information about the current element */
-void m_showcurelt(M_NOPAR)
+void m_showcurelt(void)
   {
     if (m_stacktop->oldtop)
       m_dispcurelt(m_stacktop->file, m_stacktop->line);
     }    
 
 /* Start an error message */
-void m_startmsg(M_NOPAR)
+void m_startmsg(void)
   {
     m_eprefix();
     m_errexit = TRUE;
@@ -400,7 +400,7 @@ void m_startmsg(M_NOPAR)
 
 /* Return the name of the current input file (most recently opened, but
    unclosed SYSTEM entity) */
-M_WCHAR *m_thisfile(M_NOPAR)
+M_WCHAR *m_thisfile(void)
   {
     int i;
 
@@ -413,7 +413,7 @@ M_WCHAR *m_thisfile(M_NOPAR)
     }
 
 /* Return the line number in the current input file */
-int m_thisline(M_NOPAR)
+int m_thisline(void)
   {
     return(m_line[m_sysecnt]);
     }

cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c

@@ -32,7 +32,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 #endif
 
 /* Write error message suffix */
-void m_esuffix(M_NOPAR)
+void m_esuffix(void)
   {
     m_errline("\n") ;
     m_dumpline(m_thisfile(), m_thisline()) ;

cde/programs/dthelp/parser.ccdf/htag/parser/getsign.c

@@ -34,7 +34,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 #include "parser.h"
 #include "signonx.h"
 
-void m_getsignon(M_NOPAR)
+void m_getsignon(void)
   {
     m_errline(m_signon) ;
     }

cde/programs/dthelp/parser.ccdf/htag/parser/input.c

@@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "parser.h"
 
 /* M_etcomplete is called when a complete end-tag has been read */
-void m_etcomplete(M_NOPAR)
+void m_etcomplete(void)
   {
     if (! m_scanel) {
       M_WCHAR *wc_etago, *wc_tagc;
@@ -91,7 +91,7 @@ void m_frcend(val)
 
 /* M_frcstart is called to force the start of an element when that element
    cannot legally occur in the current context but does appear in the text*/
-void m_frcstart(M_NOPAR)
+void m_frcstart(void)
   {
     m_push(m_scanel, m_element[m_scanel - 1].start, m_scannet) ;
     if (m_scannet) m_netlevel++ ;
@@ -108,7 +108,7 @@ void m_frcstart(M_NOPAR)
 
 /* M_holdproc processes a RE that was saved to test if it was the last
    RE in an element's content */
-void m_holdproc(M_NOPAR)
+void m_holdproc(void)
   {
     if (m_stacktop->holdre) {
       m_stacktop->holdre = FALSE ;
@@ -122,7 +122,7 @@ void m_holdproc(M_NOPAR)
     }
 
 /* M_stcomplete is called when a complete start tag has been recognized */
-void m_stcomplete(M_NOPAR)
+void m_stcomplete(void)
   {
     if (! m_scanel) return ;
     if (m_strtproc(m_scanel))

cde/programs/dthelp/parser.ccdf/htag/parser/minim.c

@@ -43,7 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* M_expecting reports to the user the possible valid content at a particular
    state in the parse of the document */
-void m_expecting(M_NOPAR)
+void m_expecting(void)
   {
     LOGICAL expstart = TRUE ;
     M_PARSE *stackptr ;
@@ -276,7 +276,7 @@ M_ELEMENT m_findunique(from, newleft)
 
 /* M_nullendtag is called when a null end tag is encountered; i.e., at the
    end of a short element */
-void m_nullendtag(M_NOPAR)
+void m_nullendtag(void)
   {
     LOGICAL foundnet ;
 
@@ -307,7 +307,7 @@ void m_nullendtag(M_NOPAR)
 
 /* Tests to see if an end tag may have been omitted at this point in the
    parse.*/
-LOGICAL m_omitend(M_NOPAR)
+LOGICAL m_omitend(void)
   {
     M_ANDGROUP pand ;
     M_OPENFSA *fsastack ;

cde/programs/dthelp/parser.ccdf/htag/parser/openfrst.c

@@ -28,7 +28,7 @@
 #include "userinc.h"
 #include "globdec.h"
 
-void *m_openfirst(M_NOPAR)
+void *m_openfirst(void)
   {
     return((void *) stdin) ;
     }

cde/programs/dthelp/parser.ccdf/htag/parser/param.c

@@ -117,7 +117,7 @@ LOGICAL m_attvonly(string)
 
 /* Check a name previously saved in m_saveatt to see if it is the name of
    a valid parameter for the current start tag */
-void m_findatt(M_NOPAR)
+void m_findatt(void)
   {
     int par, i ;
 
@@ -220,7 +220,7 @@ void m_parupper(par, string)
 
 /* Set all parameters to their default values for an element included by
    tag minimization */
-void m_stkdefaultparams(M_NOPAR)
+void m_stkdefaultparams(void)
   {
     int i, par = 0 ;
 
@@ -272,7 +272,7 @@ void m_stkonedef(par, scanel, poccur, i)
     }
 
 /* Stack parameter values */
-void m_stkparams(M_NOPAR)
+void m_stkparams(void)
   {
     int i, par ;
 

cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c

@@ -48,7 +48,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "version.h"
 
 /* Adjust parsing state after each token if necessary */
-void m_adjuststate(M_NOPAR)
+void m_adjuststate(void)
   {
     if (m_curcon == START) {
       if (m_netlevel) {
@@ -79,7 +79,7 @@ void m_adjuststate(M_NOPAR)
 
 /* Tests whether the element named in a tag is defined; if so, returns its
    index; otherwise return FALSE */
-M_ELEMENT m_eltname(M_NOPAR)
+M_ELEMENT m_eltname(void)
   {
     M_ELEMENT eltid ;
 
@@ -103,7 +103,7 @@ return i;
 }
 
 /* Program initialization */
-void m_initialize(M_NOPAR)
+void m_initialize(void)
 {
 char    **mb_delims;
 M_WCHAR **wc_delims;

cde/programs/dthelp/parser.ccdf/htag/parser/proto.h

@@ -21,9 +21,9 @@
  * Floor, Boston, MA 02110-1301 USA
  */
 /* $XConsortium: proto.h /main/3 1995/11/08 11:30:37 rswiston $ */
-int m_actgetc(M_NOPAR);
+int m_actgetc(void);
 
-void m_adjuststate(M_NOPAR);
+void m_adjuststate(void);
 
 LOGICAL m_allwhite(const M_WCHAR *string);
 
@@ -41,20 +41,20 @@ void m_closent(void *m_ptr);
 
 void m_codeent(int m_ent);
 
-M_PARSE *m_copystackelt(M_NOPAR);
+M_PARSE *m_copystackelt(void);
 
 M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, 
   unsigned char *wheredef);
 
 void m_dispcurelt(M_WCHAR *file, int line);
 
-void m_done(M_NOPAR);
+void m_done(void);
 
 void m_dumpline(M_WCHAR *file, int line);
 
 void m_eduptype(int type);
 
-M_ELEMENT m_eltname(M_NOPAR);
+M_ELEMENT m_eltname(void);
 
 void m_endaction(M_ELEMENT m_elt);
 
@@ -64,7 +64,7 @@ void m_endtag(M_ELEMENT c);
 
 void m_entexpand(M_ENTITY *openent);
 
-void m_eprefix(M_NOPAR);
+void m_eprefix(void);
 
 void m_err1(const char *text, const M_WCHAR *arg);
 
@@ -87,15 +87,15 @@ void m_errline(char *p);
 
 void m_error(char *text);
 
-void m_esuffix(M_NOPAR);
+void m_esuffix(void);
 
 void m_exit(int status);
 
-void m_etcomplete(M_NOPAR);
+void m_etcomplete(void);
 
 LOGICAL m_excluded(M_ELEMENT elt);
 
-void m_expecting(M_NOPAR);
+void m_expecting(void);
 
 void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data);
 
@@ -105,7 +105,7 @@ void m_exptend(LOGICAL *expstart, M_PARSE *stackptr);
 
 int m_findact(M_ELEMENT elt, int *array);
 
-void m_findatt(M_NOPAR);
+void m_findatt(void);
 
 void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, 
   LOGICAL wild);
@@ -116,7 +116,7 @@ M_ELEMENT m_findunique(M_STATE from, int *newleft);
 
 void m_frcend(M_ELEMENT val);
 
-void m_frcstart(M_NOPAR);
+void m_frcstart(void);
 
 void m_free(void *block, char *msg);
 
@@ -140,23 +140,23 @@ void m_getline(M_WCHAR **file, int *line);
 
 void m_getname(M_WCHAR first);
 
-void m_getsignon(M_NOPAR);
+void m_getsignon(void);
 
 int m_gettoken(int *c, M_HOLDTYPE *dchar, int context);
 
-void m_globes(M_NOPAR);
+void m_globes(void);
 
-void m_globss(M_NOPAR);
+void m_globss(void);
 
-void m_holdproc(M_NOPAR);
+void m_holdproc(void);
 
 void m_inctest(int *count, int limit, char *message);
 
-void m_initctype(M_NOPAR);
+void m_initctype(void);
 
-void m_initialize(M_NOPAR);
+void m_initialize(void);
 
-void m_lastchars(M_NOPAR);
+void m_lastchars(void);
 
 int m_level(M_WCHAR *elt);
 
@@ -182,17 +182,17 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LO
 
 void m_ntrent(M_WCHAR *p);
 
-void m_nullendtag(M_NOPAR);
+void m_nullendtag(void);
 
-LOGICAL m_omitend(M_NOPAR);
+LOGICAL m_omitend(void);
 
-LOGICAL m_omitstart(M_NOPAR);
+LOGICAL m_omitstart(void);
 
 void m_openchk(FILE **ptr, char *name, char *mode);
 
 void *m_openent(M_WCHAR *entcontent);
 
-void *m_openfirst(M_NOPAR);
+void *m_openfirst(void);
 
 void m_optstring(char *p);
 
@@ -216,45 +216,45 @@ LOGICAL m_parvalok(M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value);
 
 void m_piaction(M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype);
 
-void m_pop(M_NOPAR);
+void m_pop(void);
 
 void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need);
 
 LOGICAL m_putdata(void *data, int n);
 
-void m_readcomments(M_NOPAR);
+void m_readcomments(void);
 
 void *m_realloc(void *ptr, int size, char *msg);
 
-int m_scan(M_NOPAR);
+int m_scan(void);
 
 void m_setmap(int map, LOGICAL useoradd);
 
-void m_setoptions(M_NOPAR);
+void m_setoptions(void);
 
 void m_setparam(M_WCHAR **cvar, int par);
 
 void m_shortref(int context);
 
-void m_showcurelt(M_NOPAR);
+void m_showcurelt(void);
 
 void m_signmsg(char *p);
 
-void m_sigre(M_NOPAR);
+void m_sigre(void);
 
-void m_startdoc(M_NOPAR);
+void m_startdoc(void);
 
-void m_startmsg(M_NOPAR);
+void m_startmsg(void);
 
 void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END);
 
-void m_stcomplete(M_NOPAR);
+void m_stcomplete(void);
 
-void m_stkdefaultparams(M_NOPAR);
+void m_stkdefaultparams(void);
 
 void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i);
 
-void m_stkparams(M_NOPAR);
+void m_stkparams(void);
 
 void m_strtaction(M_ELEMENT m_elt);
 
@@ -270,11 +270,11 @@ void m_textaction(M_WCHAR m_textchar);
 
 void m_textout(char *format, LOGICAL start, LOGICAL end);
 
-LOGICAL m_textpermitted(M_NOPAR);
+LOGICAL m_textpermitted(void);
 
-M_WCHAR *m_thisfile(M_NOPAR);
+M_WCHAR *m_thisfile(void);
 
-int m_thisline(M_NOPAR);
+int m_thisline(void);
 
 void m_trace(char *p);
 
@@ -296,7 +296,7 @@ int m_mbmbupstrcmp(const char *p, const char *q);
 
 LOGICAL m_validinpar(M_WCHAR *string);
 
-LOGICAL m_vldentref(M_NOPAR);
+LOGICAL m_vldentref(void);
 
 LOGICAL m_whitespace(M_WCHAR c);
 

cde/programs/dthelp/parser.ccdf/htag/parser/scan.c

@@ -51,7 +51,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "sref.h"
 
 /* Actually read a character from an input stream */
-int m_actgetc(M_NOPAR)
+int m_actgetc(void)
   {
     int c ;
 
@@ -689,7 +689,7 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart,
     }
 
 /* Scans past a comment within a markup declaration */
-void m_readcomments(M_NOPAR)
+void m_readcomments(void)
   {
     int c ;
     M_HOLDTYPE dchar ;
@@ -702,7 +702,7 @@ void m_readcomments(M_NOPAR)
     }
 
 /* Scanner */
-int m_scan(M_NOPAR)
+int m_scan(void)
   {
     int c ;
     M_HOLDTYPE dchar ;
@@ -1035,7 +1035,7 @@ while (TRUE)
           or contextual end tag [linestat == M_SOMETHING]
       3)  If a record end might be the last one in an element, save it
 */
-void m_sigre(M_NOPAR)
+void m_sigre(void)
   {
     /* Check for first RE in content and no preceding content */
     if (m_start &&
@@ -1111,7 +1111,7 @@ void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread)
     }
 
 /* Have encountered an M_ERO.  If the entity reference is valid, process it*/
-LOGICAL m_vldentref(M_NOPAR)
+LOGICAL m_vldentref(void)
   {
     M_HOLDTYPE dchar ;
     int next ;

cde/programs/dthelp/parser.ccdf/htag/parser/setopt.c

@@ -30,7 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 
 
 /* Set program options */
-void m_setoptions(M_NOPAR)
+void m_setoptions(void)
   {
     if (m_argc > 1) m_optstring(m_argv[1]) ;
     }

cde/programs/dthelp/parser.ccdf/htag/parser/startdoc.c

@@ -32,7 +32,7 @@ Copyright 1989 Hewlett-Packard Co.
    control after all entity declarations have been processed.  Not needed
    in valid documents (when it is called just prior to global start-code),
    but may be useful in some applications nevertheless. */
-void m_startdoc(M_NOPAR)
+void m_startdoc(void)
   {
     }
 

cde/programs/dthelp/parser.ccdf/htag/parser/struct.c

@@ -191,7 +191,7 @@ LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet)
 
 /* Make a copy of the stack entry at the top of the parse stack in a scratch
    area */
-M_PARSE *m_copystackelt(M_NOPAR)
+M_PARSE *m_copystackelt(void)
   {
     M_OPENFSA *oldfsa ;
     M_OPENFSA **newfsa ;
@@ -219,7 +219,7 @@ M_PARSE *m_copystackelt(M_NOPAR)
     }
 
 /* End of document */
-void m_done(M_NOPAR)
+void m_done(void)
   {
     M_ELEMENT lastelt ;
 
@@ -395,7 +395,7 @@ LOGICAL m_nextand(thisfsa, label)
     }
 
 /* Pops the parse stack*/
-void m_pop(M_NOPAR)
+void m_pop(void)
   {
     M_PARSE *stackelt ;
 
@@ -661,7 +661,7 @@ void m_strttag(M_ELEMENT val, LOGICAL net)
    makes more sense, is used by MARKUP, and is under consideration by the
    Standards committee; the latter is the current definition in the Standard
    */
-LOGICAL m_textpermitted(M_NOPAR)
+LOGICAL m_textpermitted(void)
   {
     M_ANDGROUP pand ;
     M_OPENFSA *fsastack ;

cde/programs/dthelp/parser.ccdf/htag/util/basic.h

@@ -47,8 +47,6 @@ typedef wchar_t M_WCHAR;
 /* For function prototypes */
 typedef char * M_POINTER;
 
-#define M_NOPAR void
-
 char *MakeMByteString(const M_WCHAR *from);
 
 M_WCHAR *MakeWideCharString(const char *from);

cde/programs/dthelp/parser.ccdf/htag/util/cont.h

@@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 void countdown(M_TRIE *parent, int *count);
 
-void dumpdlmptr(M_NOPAR);
+void dumpdlmptr(void);
 
 void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc));
 
@@ -53,17 +53,17 @@ void m_err1(char *text, char *arg);
 
 void getcode(int n);
 
-void getcolon(M_NOPAR);
+void getcolon(void);
 
-int getcontext(M_NOPAR);
+int getcontext(void);
 
-LOGICAL getdname(M_NOPAR);
+LOGICAL getdname(void);
 
-void inccon(M_NOPAR);
+void inccon(void);
 
-void incdelim(M_NOPAR);
+void incdelim(void);
 
-void loaddelim(M_NOPAR);
+void loaddelim(void);
 
 int m_lower(int c);
 
@@ -81,7 +81,7 @@ void prtctxt(int column, int value);
 
 int readchar(LOGICAL cap);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 void unread(int c);
 

cde/programs/dthelp/parser.ccdf/htag/util/conutil.c

@@ -40,7 +40,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "cont.h"
 
 /* Output declaration of dlmptr */
-void dumpdlmptr(M_NOPAR)
+void dumpdlmptr(void)
   {
     int n;
 
@@ -214,7 +214,7 @@ while (TRUE)
 } /* End proc getcode() */
 
 /* Read the colon separating the two states in a transition pair */
-void getcolon(M_NOPAR)
+void getcolon(void)
 {
 int c ; /* c is int instead of char for use with ungetc */
 M_WCHAR wcl;
@@ -237,7 +237,7 @@ if (c != wcl)
 }
 
 /* Read a context name from an input line */
-int getcontext(M_NOPAR)
+int getcontext(void)
 {
 M_WCHAR name[CNAMELEN + 1];
 int c ; /* c is int instead of char for use with ungetc */
@@ -304,7 +304,7 @@ return(ccount - 1);
 }
 
 /* Read a delimiter name from the input line */
-LOGICAL getdname(M_NOPAR)
+LOGICAL getdname(void)
 {
 int c;
 M_WCHAR *p;
@@ -348,7 +348,7 @@ return(TRUE);
 }
 
 /* Out of context space.  Increase. */
-void inccon(M_NOPAR)
+void inccon(void)
   {
     M_TRIE **newtrie = NULL;
     int *newtransit = NULL;
@@ -395,7 +395,7 @@ void inccon(M_NOPAR)
     }
 
 /* Increase delimiter space. */
-void incdelim(M_NOPAR)
+void incdelim(void)
 {
 int *newtransit = NULL;
 char **newdlm = NULL;
@@ -438,7 +438,7 @@ dcount++;
 }
 
 /* Read delimiter definitions from delim.dat */
-void loaddelim(M_NOPAR)
+void loaddelim(void)
 {
 int c;
 M_WCHAR *p;
@@ -642,7 +642,7 @@ return(c);
 
 /* Called by utility procedure m_error() -- has content in other programs
    that use m_error() */
-void skiptoend(M_NOPAR)
+void skiptoend(void)
 {
 }
 

cde/programs/dthelp/parser.ccdf/htag/util/error.c

@@ -56,7 +56,7 @@ void msgline(char *text);
 
 void msg1line(char *text, char *arg1);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 void m_wctrace(M_WCHAR *text);
 
@@ -185,7 +185,7 @@ m_free(mb_arg5,"multi-byte string");
 }
 
 /* Write error message suffix */
-void esuffix(M_NOPAR)
+void esuffix(void)
   {
     fprintf(stderr, " (line %d) ****\n", m_line) ;
     fprintf(m_errfile, " (line %d) ****\n", m_line) ;

cde/programs/dthelp/parser.ccdf/htag/util/initct.c

@@ -29,9 +29,9 @@
 #include "common.h"
 extern char m_chartype[M_CHARSETLEN] ;
 
-void m_initctype(M_NOPAR);
+void m_initctype(void);
 
-void m_initctype(M_NOPAR)
+void m_initctype(void)
   {
     int i ;
 

cde/programs/dthelp/parser.ccdf/htag/util/malloc.c

@@ -42,7 +42,7 @@ void m_exit(int status);
 
 void m_free(void *block, char *msg);
 
-void m_heapdump(M_NOPAR);
+void m_heapdump(void);
 
 void *m_malloc(int size, char *msg);
 
@@ -81,7 +81,7 @@ void m_free(block, msg)
     }
 
 #if defined(MSDOS)
-void m_heapdump(M_NOPAR)
+void m_heapdump(void)
   {
     struct _heapinfo hinfo ;
     int heapstatus ;

cde/programs/dthelp/parser.ccdf/htag/util/scanutil.c

@@ -28,7 +28,7 @@
 extern FILE *ifile;
 
 /* Getachar returns the next character from the input stream */
-int getachar(M_NOPAR)
+int getachar(void)
 {
 int  c;
 M_WCHAR wc,wnl;

cde/programs/dthelp/parser.ccdf/htag/util/trie.c

@@ -85,7 +85,7 @@ void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c)
    } /* end entertree */
 
 /* Gets a new node for a trie */
-M_TRIE *m_gettrienode(M_NOPAR)
+M_TRIE *m_gettrienode(void)
   {
     M_TRIE *new ;
 

cde/programs/dthelp/parser.ccdf/htag/util/trie.h

@@ -51,7 +51,7 @@ struct m_ptrie {
   } ;
 
 
-M_TRIE *m_gettrienode(M_NOPAR);
+M_TRIE *m_gettrienode(void);
 
 void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie);
 

cde/programs/dthelp/parser/canon1/build/buildutl.c

@@ -62,7 +62,7 @@ if (*flag)
 }
 
 /* Program initialization */
-void initialize(M_NOPAR)
+void initialize(void)
 {
 char    **mb_delims;
 M_WCHAR **wc_delims;
@@ -90,7 +90,7 @@ ruleinit() ;
 
 
 /* Initialization before starting a new rule */
-void ruleinit(M_NOPAR)
+void ruleinit(void)
   {
     /* Reinitialize for next rule */
     lhs = NULL ;
@@ -110,7 +110,7 @@ void ruleinit(M_NOPAR)
     }
 
 /* Rule end processing */
-void rulend(M_NOPAR)
+void rulend(void)
   {
     STATE *fsa = NULL ;
     LOGICAL canbenull ;
@@ -150,7 +150,7 @@ void rulend(M_NOPAR)
     }
 
 /* Skip rest of statement after an error */
-void skiptoend(M_NOPAR)
+void skiptoend(void)
   {
     int i ;
     static int errlev = 0 ;

cde/programs/dthelp/parser/canon1/build/except.c

@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "build.h"
 
 /* Add an exception (inclusion or exclusion) for the current element */
-void addex(M_NOPAR)
+void addex(void)
   {
     excount++ ;
     *nextex = (EXCEPTION *) m_malloc(sizeof(EXCEPTION), "exception") ;

cde/programs/dthelp/parser/canon1/build/fsa.c

@@ -176,7 +176,7 @@ void dellist(list)
 
 /* Delstartarcs deletes the contents of the starta list of arcs from start
    states of a submodel */
-void delstartarcs(M_NOPAR)
+void delstartarcs(void)
   {
     ARC *arcptr ;
     ARC *discard ;
@@ -190,7 +190,7 @@ void delstartarcs(M_NOPAR)
     }
 
 /* Getand allocates and initializes a new andgroup structure */
-ANDGROUP *getand(M_NOPAR)
+ANDGROUP *getand(void)
   {
     ANDGROUP *new ;
 
@@ -203,7 +203,7 @@ ANDGROUP *getand(M_NOPAR)
     }    
 
 /* Getstate obtains an FSA state */
-STATE *getstate(M_NOPAR)
+STATE *getstate(void)
   {
     STATE *new ;
 
@@ -477,7 +477,7 @@ LOGICAL permitspcd(a)
 
 /* Pop pops the submodel stack when the end of the current submodel is
    encountered */
-void pop(M_NOPAR)
+void pop(void)
   {
     STACK *discard ;
 
@@ -493,7 +493,7 @@ void pop(M_NOPAR)
     }
 
 /* Push pushes the submodel stack when a new group is encountered */
-void push(M_NOPAR)
+void push(void)
   {
     STACK *new ;
 
@@ -647,7 +647,7 @@ void savelhs(LOGICAL param)
 /* Called when arcs are added to the start state of a submodel that is
    also a start state of the parent model to set the parent model's
    starta list */
-void savestartarcs(M_NOPAR)
+void savestartarcs(void)
   {
     ARC *carcptr, *parcptr ;
 

cde/programs/dthelp/parser/canon1/build/out.c

@@ -87,7 +87,7 @@ char *deftype(n)
     }
 
 /* Called after all input is read to generate output */
-void done(M_NOPAR)
+void done(void)
   {
 
     if (! eltree.data) {
@@ -167,7 +167,7 @@ void eltblocks(tempfile)
 
 
 /* Writes data about elements */
-void eltreeout(M_NOPAR)
+void eltreeout(void)
   {
     M_WCHAR *p ;
     int enameindex = 0 ;
@@ -245,7 +245,7 @@ char *enttype(n)
     }
 
 /* Outputs exception lists */
-void exout(M_NOPAR)
+void exout(void)
   {
     EXCEPTION *ex ;
     int exindex = 0 ;
@@ -268,7 +268,7 @@ void exout(M_NOPAR)
     }
 
 /* Outputs FSA definitions */
-void fsa(M_NOPAR)
+void fsa(void)
   {
     int arcount = 0 ;
     STATE *pstate ;
@@ -331,7 +331,7 @@ void fsa(M_NOPAR)
     }
 
 /* Writes data about parameters */
-void parout(M_NOPAR)
+void parout(void)
 {
 PARAMETER *paramp ;
 LOGICAL first = TRUE ;
@@ -480,7 +480,7 @@ char *partype(n)
     }
 
 /* Write short reference information */
-void srefout(M_NOPAR)
+void srefout(void)
   {
     LOGICAL first = TRUE ;
     int *mapbysref = NULL ;
@@ -630,7 +630,7 @@ fputs("  <END-STRING></END-STRING>\n", tempfile) ;
 }
 
 /* Write template */
-void template(M_NOPAR)
+void template(void)
   {
     FILE *tempfile ;
     M_ENTITY *ent ;

cde/programs/dthelp/parser/canon1/build/param.c

@@ -38,7 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Add a keyword to the list of possible values of a keyword parameter for
    the current element
 */
-void addkeyword(M_NOPAR)
+void addkeyword(void)
 {
 int length ;
 PARAMETER *par ;
@@ -87,7 +87,7 @@ ptypelen++ ;
 }
 
 /* Add a parameter to the current element */
-void addpar(M_NOPAR)
+void addpar(void)
 {
 PARAMETER *paramp, *last = NULL ;
 int length ;
@@ -263,7 +263,7 @@ switch (newpar->type)
 }
 
 /* Called at end of parameter attribute list rule */
-void prulend(M_NOPAR)
+void prulend(void)
 {
 LHS *lhsp ;
 LHS *discard ;

cde/programs/dthelp/parser/canon1/build/proto.h

@@ -35,15 +35,15 @@ void adddefent(M_WCHAR *mapname);
 
 LOGICAL addent(M_WCHAR *name);
 
-void addex(M_NOPAR);
+void addex(void);
 
-void addkeyword(M_NOPAR);
+void addkeyword(void);
 
 LOGICAL addmapname(M_WCHAR *p, LOGICAL define);
 
 void addndent(M_WCHAR *p);
 
-void addpar(M_NOPAR);
+void addpar(void);
 
 void addsref(M_WCHAR *p);
 
@@ -62,15 +62,15 @@ void copyintolist(STATELIST *from, STATELIST **to);
 
 void countdown(M_TRIE *parent, int *count);
 
-void defmapname(M_NOPAR);
+void defmapname(void);
 
 char *deftype(int n);
 
 void dellist(STATELIST **list);
 
-void delstartarcs(M_NOPAR);
+void delstartarcs(void);
 
-void done(M_NOPAR);
+void done(void);
 
 void dumpentnode(FILE *file, M_TRIE *value);
 
@@ -90,9 +90,9 @@ void m_dumptrie(FILE   *file,
 
 void eltblocks(FILE *tempfile);
 
-void eltreeout(M_NOPAR);
+void eltreeout(void);
 
-void endmodel(M_NOPAR);
+void endmodel(void);
 
 void entout(char *fname);
 
@@ -106,7 +106,7 @@ void m_mberr1(char *text, const char *arg);
 
 void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
 
-void exout(M_NOPAR);
+void exout(void);
 
 void m_free(void *block, char *msg);
 
@@ -114,23 +114,23 @@ void freetree(TREE *ruletree);
 
 void found(LOGICAL *flag, char *delim);
 
-void fsa(M_NOPAR);
+void fsa(void);
 
-int getachar(M_NOPAR);
+int getachar(void);
 
-ANDGROUP *getand(M_NOPAR);
+ANDGROUP *getand(void);
 
 LOGICAL getname(int first);
 
-STATE *getstate(M_NOPAR);
+STATE *getstate(void);
 
 int gettoken(int *c, int context);
 
-TREE *gettreenode(M_NOPAR);
+TREE *gettreenode(void);
 
-void m_initctype(M_NOPAR);
+void m_initctype(void);
 
-void initialize(M_NOPAR);
+void initialize(void);
 
 LOGICAL litproc(int delim);
 
@@ -160,49 +160,49 @@ ELTSTRUCT *ntrelt(M_WCHAR *p);
 
 void m_openchk(FILE **ptr, char *name, char *mode);
 
-void parout(M_NOPAR);
+void parout(void);
 
 char *partype(int n);
 
 LOGICAL permitspcd(ARC *a);
 
-void pop(M_NOPAR);
+void pop(void);
 
-void prulend(M_NOPAR);
+void prulend(void);
 
-void push(M_NOPAR);
+void push(void);
 
 LOGICAL regenerate(TREE *start, TREE *stop);
 
 void repeat(TREE *root);
 
-void ruleinit(M_NOPAR);
+void ruleinit(void);
 
-void rulend(M_NOPAR);
+void rulend(void);
 
 LOGICAL samelabelarc(ARC *a, STATE *s);
 
 void savelhs(LOGICAL param);
 
-void savestartarcs(M_NOPAR);
+void savestartarcs(void);
 
-int scan(M_NOPAR);
+int scan(void);
 
 void setdefault(const M_WCHAR *string);
 
 void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 int m_sprscon(int i, int j);
 
-void srefout(M_NOPAR);
+void srefout(void);
 
 STATE *startfsa(TREE *root, LOGICAL *canbenull);
 
 void tempelt(ELTSTRUCT *eltp, FILE *tempfile);
 
-void template(M_NOPAR);
+void template(void);
 
 char *typecon(int n);
 

cde/programs/dthelp/parser/canon1/build/scan.c

@@ -74,7 +74,7 @@ return(TRUE);
 }
 
 /* Returns the next token to the main procedure */
-int scan(M_NOPAR)
+int scan(void)
 {
 int c;
 int n;

cde/programs/dthelp/parser/canon1/build/sref.c

@@ -192,7 +192,7 @@ delim->data = thissref;
 
 /* Prefix left-hand side with "M-" to create default short reference map
    name, truncating to M_NAMELEN characters if necessary */
-void defmapname(M_NOPAR)
+void defmapname(void)
 {
 if (!wc_prefix)
     {

cde/programs/dthelp/parser/canon1/build/tree.c

@@ -36,7 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Called after a right parenthesis is read while scanning a content model.
    Resets curcon if it is the outermost submodel. */
-void endmodel(M_NOPAR)
+void endmodel(void)
   {
     curtree = curtree->parent ;
     if (! curtree->parent) curcon = LASTM ;
@@ -58,7 +58,7 @@ void freetree(treep)
     }
 
 /* Gettreenode obtains a node to use in the tree representation of a rule */
-TREE *gettreenode(M_NOPAR)
+TREE *gettreenode(void)
   {
     TREE *new ;
 

cde/programs/dthelp/parser/canon1/eltdef/context.dat

@@ -398,7 +398,7 @@ tagc
   postent:start
   codetagc:inentc {
             startcode(entity->codeindex, &inent, entfile,
-                      "c", nopar, nopar, "") ;
+                      "c", "void", "void", "") ;
             }
   close:preparam
   sschain:inss {
@@ -420,11 +420,11 @@ tagc
             }
   scchain:insc {
             *getaction(scarray) = ++sactions ;
-            startcode(sactions, &insc, sfile, "s", nopar, nopar, "") ;
+            startcode(sactions, &insc, sfile, "s", "void", "void", "") ;
             }
   ecchain:inec {
             *getaction(ecarray) = ++eactions ;
-            startcode(eactions, &inec, efile, "e", nopar, nopar, "") ;
+            startcode(eactions, &inec, efile, "e", "void", "void", "") ;
             }
   stcchain:instc {
             *getaction(stcarray) = ++stactions ;

cde/programs/dthelp/parser/canon1/eltdef/eltdef.h

@@ -215,7 +215,6 @@ ELTEXTERN int restart ELTINIT(RENTITY) ;
 #define stproto "M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END"
 #define stformal "m_string, M_START, M_END"
 #define stft "  M_WCHAR *m_string ;\n  LOGICAL M_START ;\n  LOGICAL M_END ;\n"
-#define nopar "M_NOPAR"
 
 /* Structures for generating defines for parameter values */
 ELTEXTERN M_TRIE parval ;

cde/programs/dthelp/parser/canon1/eltdef/eltutil.c

@@ -92,7 +92,7 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto)
 
 /* Called when the C identifier to be #define'd to a parameter value is
    scanned */
-void cvalue(M_NOPAR)
+void cvalue(void)
   {
     PARVAL *new;
 
@@ -111,18 +111,18 @@ void cvalue(M_NOPAR)
 
 /* Called after last input character is read to place closing punctuation
    at end of output files and close them */
-void done(M_NOPAR)
+void done(void)
   {
     M_ENTITY *ent;
     ACTION *actp;
     LOGICAL first;
     int i;
 
-    closeiffile(inent, entfile, codeent, "c", nopar);
+    closeiffile(inent, entfile, codeent, "c", "void");
     closeiffile(intext, tfile, tactions, "t", tproto);
     closeiffile(inpc, pfile, pactions, "p", pproto);
-    closeiffile(insc, sfile, sactions, "s", nopar);
+    closeiffile(insc, sfile, sactions, "s", "void");
-    closeiffile(inec, efile, eactions, "e", nopar);
+    closeiffile(inec, efile, eactions, "e", "void");
     closeiffile(instc, stfile, stactions, "st", stproto);
 
     endstring();
@@ -190,7 +190,7 @@ void endcode(LOGICAL flag, FILE *file)
     }
 
 /* Called at the end of all initial fields in the interface definition */
-void endini(M_NOPAR)
+void endini(void)
   {
     if (finitext) 
       fputs("    putc(m_textchar, m_outfile);\n", tfile);
@@ -209,7 +209,7 @@ void endini(M_NOPAR)
 
 /* End the sign-on message */
 #include <time.h>
-void endsignon(M_NOPAR)
+void endsignon(void)
   {
     time_t storetime;
     char *p;
@@ -255,7 +255,7 @@ void endsignon(M_NOPAR)
     }
 
 /* Closes a start-string or end-string */
-void endstring(M_NOPAR)
+void endstring(void)
   {
     if (instring) {
       if (stringstart) stringstart = FALSE;
@@ -282,7 +282,7 @@ void enttype(type)
     }
 
 /* Free storage used for a context-specification chain */
-void freechain(M_NOPAR)
+void freechain(void)
   {
     CHAIN *chainp, *dchainp;
 
@@ -333,7 +333,7 @@ int *getaction(array)
     }
 
 /* Allocate new action structure */
-ACTION *getactstruct(M_NOPAR)
+ACTION *getactstruct(void)
   {
     ACTION *new;
 
@@ -347,7 +347,7 @@ ACTION *getactstruct(M_NOPAR)
     }
 
 /* Program initialization */
-void initialize(M_NOPAR)
+void initialize(void)
 {
 char    **mb_delims;
 M_WCHAR **wc_delims;
@@ -411,13 +411,13 @@ fputs("#endif\n", ifh);
 
 startcode(pactions, &inpc, pfile, "p", pproto, pformal, pftype);
 startcode(tactions, &intext, tfile, "t", tproto, tformal, tftype);
-startcode(sactions, &insc, sfile, "s", nopar, nopar, "");
+startcode(sactions, &insc, sfile, "s", "void", "void", "");
-startcode(eactions, &inec, efile, "e", nopar, nopar, "");
+startcode(eactions, &inec, efile, "e", "void", "void", "");
 startcode(stactions, &instc, stfile, "st", stproto, stformal, stft);
 }
 
 /* Output definitions for strings */
-void outstring(M_NOPAR)
+void outstring(void)
   {
     int c;
 
@@ -480,7 +480,7 @@ for ( ; p ; p = p->next)
 }
 
 /* Skip rest of statement after an error */
-void skiptoend(M_NOPAR)
+void skiptoend(void)
   {
     int i;
     static int errlev = 0;
@@ -580,7 +580,7 @@ fprintf(file, "{\n/* line %d \"%s\" */\n", m_line, iffile); /* balance "}" */
 }
 
 /* Begins processing a new element */
-void startelement(M_NOPAR)
+void startelement(void)
   {
     CVARSTRUCT *cvarp;
     CVARSTRUCT *discard;
@@ -601,7 +601,7 @@ void startelement(M_NOPAR)
     }
 
 /* Stores the name of a C variable read from the input file */
-void storecvar(M_NOPAR)
+void storecvar(void)
   {
     CVARSTRUCT *new;
 
@@ -616,7 +616,7 @@ void storecvar(M_NOPAR)
 /* Compares the parameter name associated with a C variable in the input
    file with the names of all parameters of the current element.  Stores
    result for later output with code segments */
-void storepname(M_NOPAR)
+void storepname(void)
   {
     int i, par;
 

cde/programs/dthelp/parser/canon1/eltdef/entity.c

@@ -35,7 +35,7 @@
 #include "entext.h"
 
 /* Add an entity */
-void addent(M_NOPAR)
+void addent(void)
   {
     M_ENTITY *new ;
 

cde/programs/dthelp/parser/canon1/eltdef/proto.h

@@ -30,7 +30,7 @@
 
 void actptrout(ACTION **array, char *name);
 
-void addent(M_NOPAR);
+void addent(void);
 
 LOGICAL m_allwhite(const M_WCHAR *string);
 
@@ -38,10 +38,10 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto);
 
 void countdown(M_TRIE *parent, int *count);
 
-void cvalue(M_NOPAR);
+void cvalue(void);
 
 
-void done(M_NOPAR);
+void done(void);
 
 void m_dumptrie(FILE *file,
   M_TRIE *xtrie,
@@ -51,11 +51,11 @@ void m_dumptrie(FILE *file,
 
 void endcode(LOGICAL flag, FILE *file);
 
-void endini(M_NOPAR);
+void endini(void);
 
-void endsignon(M_NOPAR);
+void endsignon(void);
 
-void endstring(M_NOPAR);
+void endstring(void);
 
 void entout(char *fname);
 
@@ -78,21 +78,21 @@ void m_exit(int status);
 
 void m_free(void *block, char *msg);
 
-void freechain(M_NOPAR);
+void freechain(void);
 
-int getachar(M_NOPAR);
+int getachar(void);
 
 int *getaction(ACTION **array);
 
-ACTION *getactstruct(M_NOPAR);
+ACTION *getactstruct(void);
 
 void getname(int first);
 
 int gettoken(int *c, int context);
 
-void m_initctype(M_NOPAR);
+void m_initctype(void);
 
-void initialize(M_NOPAR);
+void initialize(void);
 
 LOGICAL m_letter(M_WCHAR c);
 
@@ -106,24 +106,24 @@ void m_openchk(FILE **ptr, char *name, char *mode);
 
 void outpval(M_TRIE *p);
 
-void outstring(M_NOPAR);
+void outstring(void);
 
 int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name);
 
 const M_WCHAR *m_partype(const int par, const M_WCHAR *string);
 
-int scan(M_NOPAR);
+int scan(void);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto,
   char *formal, char *formtype);
 
-void startelement(M_NOPAR);
+void startelement(void);
 
-void storecvar(M_NOPAR);
+void storecvar(void);
 
-void storepname(M_NOPAR);
+void storepname(void);
 
 void undodelim(M_WCHAR *delim);
 

cde/programs/dthelp/parser/canon1/eltdef/scan.c

@@ -86,7 +86,7 @@ ungetachar(c);
 }
 
 /* Reads the next token and returns it to the main procedure */
-int scan(M_NOPAR)
+int scan(void)
 {
 int c;
 int n;

cde/programs/dthelp/parser/canon1/helptag/custom.c

@@ -37,7 +37,7 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co.
 /* 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(M_NOPAR);
+void _setenvp(void);
 void _setenvp(){}
 #endif
 
@@ -72,7 +72,7 @@ else
 }
 
 /* Write error message prefix */
-void m_eprefix(M_NOPAR)
+void m_eprefix(void)
 {
 m_errline("\n*****\n");
 m_dumpline(m_thisfile(), m_thisline());
@@ -96,7 +96,7 @@ for ( ; *p ; p++)
 #include <process.h>
 #endif
 /* Write error message suffix */
-void m_esuffix(M_NOPAR)
+void m_esuffix(void)
 {
 m_errline(":\n");
 m_lastchars();
@@ -245,7 +245,7 @@ return(NULL);
 }
 
 /* Open input file */
-void *m_openfirst(M_NOPAR)
+void *m_openfirst(void)
 {
 FILE *first;
 char *input;

cde/programs/dthelp/parser/canon1/helptag/fproto.h

@@ -24,28 +24,28 @@
 /* Copyright (c) 1988, 1989, 1990 Hewlett-Packard Co. */
 /* Function prototypes for HP Tag/TeX translator */
 
-void assert_hometopic_exists(M_NOPAR);
+void assert_hometopic_exists(void);
 
 /* osf has basename() defined in system header file, change
  * basename() to fbasename(). --XPG4 standard.
  */
-void fbasename(M_NOPAR);
+void fbasename(void);
 
 void chapstart(M_WCHAR *id);
 
-void checkgloss(M_NOPAR);
+void checkgloss(void);
 
 M_WCHAR *checkid(M_WCHAR *id);
 
-void checkmsghead (M_NOPAR);
+void checkmsghead (void);
 
-void dumpxref(M_NOPAR);
+void dumpxref(void);
 
 void echohead(M_WCHAR *p);
 
 void mb_echohead(char *p);
 
-void endhead(M_NOPAR);
+void endhead(void);
 
 void esoutchar(M_WCHAR textchar);
 
@@ -70,7 +70,7 @@ char *m_itoa(int n, char *s);
 
 LOGICAL m_letter(M_WCHAR c);
 
-void loadxref(M_NOPAR);
+void loadxref(void);
 
 int m_lower(int c);
 
@@ -84,7 +84,7 @@ void realoutchar(M_WCHAR textchar, FILE *outfile);
 
 void rsectstart(M_WCHAR *id);
 
-void rseqend(M_NOPAR);
+void rseqend(void);
 
 M_WCHAR *searchforfile(M_WCHAR *file);
 
@@ -144,7 +144,7 @@ void StartLabList(M_WCHAR *spacing,
 
 void StartList(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont);
 
-void EndList(M_NOPAR);
+void EndList(void);
 
 void strcode(M_WCHAR *string, FILE *outfile);
 
@@ -160,7 +160,7 @@ void termchar(M_WCHAR textchar);
 
 void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname);
 
-void texinit(M_NOPAR);
+void texinit(void);
 
 int vextextsize(const M_WCHAR *keyword);
 
@@ -189,7 +189,7 @@ char *GetDefaultHeaderString(char          *elementName,
   char          *defaultString);
 
 
-void SetDefaultLocale(M_NOPAR);
+void SetDefaultLocale(void);
 
 char *MakeMByteString(const M_WCHAR *from);
 
@@ -221,11 +221,11 @@ M_WCHAR wc_toupper(     M_WCHAR wc);
 
 M_WCHAR *wc_stringtoupper(     M_WCHAR *wcp);
 
-int NextId(M_NOPAR);
+int NextId(void);
 
-char *GetLanguage(M_NOPAR);
+char *GetLanguage(void);
 
-char *GetCharset(M_NOPAR);
+char *GetCharset(void);
 
 void HandleLink(  M_WCHAR *hyperlink,
     M_WCHAR *type,
@@ -241,7 +241,7 @@ void Add2ToRowVec(  int *length, char **rowvec, char *id1, char *id2);
 
 void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize);
 
-void EndEx(M_NOPAR);
+void EndEx(void);
 
 void StartNCW(char *which);
 
@@ -251,14 +251,14 @@ void AddToSNB(char *id, char *iconName);
 
 void StartNCWtext(char *which, char *iconFile, char *headingString);
 
-void IncludeToss(M_NOPAR);
+void IncludeToss(void);
 
 M_WCHAR *CycleEnt(  LOGICAL init,
     unsigned char *type,
     M_WCHAR ***content,
     unsigned char *wheredef);
 
-void ModifyEntities(M_NOPAR);
+void ModifyEntities(void);
 
 void PushForm(char *class,
   char *ssi,
@@ -269,12 +269,12 @@ void PushForm2(char *class,
   char *id1,
   char *id2);
 
-void PopForm(M_NOPAR);
+void PopForm(void);
 
-void PopForm2(M_NOPAR);
+void PopForm2(void);
 
-void PopFormMaybe(M_NOPAR);
+void PopFormMaybe(void);
 
-void EmitSavedAnchors(M_NOPAR);
+void EmitSavedAnchors(void);
 
-void CloseVirpage(M_NOPAR);
+void CloseVirpage(void);

cde/programs/dthelp/parser/canon1/helptag/help.c

@@ -32,7 +32,7 @@
 #include "LocaleXlate.h"
 #include "XlationSvc.h"
 
-void assert_hometopic_exists(M_NOPAR)
+void assert_hometopic_exists(void)
 {
 static const char hometopic[] = "-HOMETOPIC";
 char id[SDLNAMESIZ + sizeof(hometopic)];
@@ -61,7 +61,7 @@ m_free(string, "GetDefaultHeaderString return");
 
 /* Determine base name for files (i.e., input name without extension).
    Open output and error files */
-void fbasename(M_NOPAR)
+void fbasename(void)
 {
 char *p, *q;
 int n;
@@ -292,7 +292,7 @@ if (*chapterSuffixString)
 
 /* Called at end of manual to report terms that occurred in the document
    but not entered in the glossary */
-void checkgloss(M_NOPAR)
+void checkgloss(void)
 {
 int n;
 M_WCHAR id[MAXTERM + 1];
@@ -329,7 +329,7 @@ while (TRUE)
 		
 /* End Error Message macro \starterrmsg call, check to see if Error Message
    head is user specified or default */
-void checkmsghead(M_NOPAR)
+void checkmsghead(void)
 {
 char *string =
     GetDefaultHeaderString("MessagesElementDefaultHeadingString",
@@ -933,7 +933,7 @@ chapst = TRUE;
 
 /* Called at the end of a chapter, appendix, or section to end an open
    sequence of rsects */
-void rseqend(M_NOPAR)
+void rseqend(void)
 {
 if (rsectseq)
     --thisnodelevel;
@@ -1284,7 +1284,7 @@ if (lastlist->type == BULLET) bulcount-- ;
 
 
 /* Open and initialize TeX file */
-void texinit(M_NOPAR)
+void texinit(void)
 {
 LOGICAL init = TRUE;
 unsigned char type;

cde/programs/dthelp/parser/canon1/helptag/out.c

@@ -67,7 +67,7 @@ m_free(wc,"wide character string");
 
 /* Called at end of a head in a chapter, appendix, section, or
    reference section */
-void endhead(M_NOPAR)
+void endhead(void)
 {
 if (savid)
     {

cde/programs/dthelp/parser/canon1/helptag/xref.c

@@ -143,7 +143,7 @@ m_free(csname, "csname");
 
 /* Write cross-reference file for next time document is processed
    and TeX macro file for post-processing this pass */
-void dumpxref(M_NOPAR)
+void dumpxref(void)
 {
 int n;
 M_WCHAR id[M_NAMELEN + 1];
@@ -214,7 +214,7 @@ xstrlen += length;
 
 /* Initializes cross-reference table reading in file output from previous
    pass through document */
-void loadxref(M_NOPAR)
+void loadxref(void)
 {
 M_WCHAR id[M_NAMELEN + 1];
 char c, d;

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

@@ -137,7 +137,7 @@ void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *
 /* Process global end string.  In separate procedure to keep all references
    to if.h in one source file and minimize recompilation if interface
    changes. */
-void m_globes(M_NOPAR)
+void m_globes(void)
 {
 M_WCHAR *wc_string;
 
@@ -149,7 +149,7 @@ m_free(wc_string,"wide character string");
 /* Process global start string.  In separate procedure to keep all references
    to if.h in one source file and minimize recompilation if interface
    changes. */
-void m_globss(M_NOPAR)
+void m_globss(void)
 {
 M_WCHAR *wc_string;
 

cde/programs/dthelp/parser/canon1/parser/eprefix.c

@@ -29,7 +29,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 #include "globdec.h"
 
 /* Write error message prefix */
-void m_eprefix(M_NOPAR)
+void m_eprefix(void)
   {
     m_errline("\n*****\n") ;
     }

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

@@ -334,7 +334,7 @@ void m_getline(file, line)
 
 /* Dump last characters read from input stream to give context to
    an error message */
-void m_lastchars(M_NOPAR)
+void m_lastchars(void)
 {
 int i;
 M_WCHAR buffer[2];
@@ -383,14 +383,14 @@ if ((m_svlncnt[m_sysecnt] &&
 }
 
 /* Display information about the current element */
-void m_showcurelt(M_NOPAR)
+void m_showcurelt(void)
   {
     if (m_stacktop->oldtop)
       m_dispcurelt(m_stacktop->file, m_stacktop->line);
     }    
 
 /* Start an error message */
-void m_startmsg(M_NOPAR)
+void m_startmsg(void)
   {
     m_eprefix();
     m_errexit = TRUE;
@@ -398,7 +398,7 @@ void m_startmsg(M_NOPAR)
 
 /* Return the name of the current input file (most recently opened, but
    unclosed SYSTEM entity) */
-M_WCHAR *m_thisfile(M_NOPAR)
+M_WCHAR *m_thisfile(void)
   {
     int i;
 
@@ -411,7 +411,7 @@ M_WCHAR *m_thisfile(M_NOPAR)
     }
 
 /* Return the line number in the current input file */
-int m_thisline(M_NOPAR)
+int m_thisline(void)
   {
     return(m_line[m_sysecnt]);
     }

cde/programs/dthelp/parser/canon1/parser/esuffix.c

@@ -32,7 +32,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 #endif
 
 /* Write error message suffix */
-void m_esuffix(M_NOPAR)
+void m_esuffix(void)
   {
     m_errline("\n") ;
     m_dumpline(m_thisfile(), m_thisline()) ;

cde/programs/dthelp/parser/canon1/parser/getsign.c

@@ -34,7 +34,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 #include "parser.h"
 #include "signonx.h"
 
-void m_getsignon(M_NOPAR)
+void m_getsignon(void)
   {
     m_errline(m_signon) ;
     }

cde/programs/dthelp/parser/canon1/parser/input.c

@@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "parser.h"
 
 /* M_etcomplete is called when a complete end-tag has been read */
-void m_etcomplete(M_NOPAR)
+void m_etcomplete(void)
   {
     if (! m_scanel) {
       M_WCHAR *wc_etago, *wc_tagc;
@@ -91,7 +91,7 @@ void m_frcend(val)
 
 /* M_frcstart is called to force the start of an element when that element
    cannot legally occur in the current context but does appear in the text*/
-void m_frcstart(M_NOPAR)
+void m_frcstart(void)
   {
     m_push(m_scanel, m_element[m_scanel - 1].start, m_scannet) ;
     if (m_scannet) m_netlevel++ ;
@@ -108,7 +108,7 @@ void m_frcstart(M_NOPAR)
 
 /* M_holdproc processes a RE that was saved to test if it was the last
    RE in an element's content */
-void m_holdproc(M_NOPAR)
+void m_holdproc(void)
   {
     if (m_stacktop->holdre) {
       m_stacktop->holdre = FALSE ;
@@ -122,7 +122,7 @@ void m_holdproc(M_NOPAR)
     }
 
 /* M_stcomplete is called when a complete start tag has been recognized */
-void m_stcomplete(M_NOPAR)
+void m_stcomplete(void)
   {
     if (! m_scanel) return ;
     if (m_strtproc(m_scanel))

cde/programs/dthelp/parser/canon1/parser/minim.c

@@ -43,7 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* M_expecting reports to the user the possible valid content at a particular
    state in the parse of the document */
-void m_expecting(M_NOPAR)
+void m_expecting(void)
   {
     LOGICAL expstart = TRUE ;
     M_PARSE *stackptr ;
@@ -276,7 +276,7 @@ M_ELEMENT m_findunique(from, newleft)
 
 /* M_nullendtag is called when a null end tag is encountered; i.e., at the
    end of a short element */
-void m_nullendtag(M_NOPAR)
+void m_nullendtag(void)
   {
     LOGICAL foundnet ;
 
@@ -307,7 +307,7 @@ void m_nullendtag(M_NOPAR)
 
 /* Tests to see if an end tag may have been omitted at this point in the
    parse.*/
-LOGICAL m_omitend(M_NOPAR)
+LOGICAL m_omitend(void)
   {
     M_ANDGROUP pand ;
     M_OPENFSA *fsastack ;

cde/programs/dthelp/parser/canon1/parser/openfrst.c

@@ -28,7 +28,7 @@
 #include "userinc.h"
 #include "globdec.h"
 
-void *m_openfirst(M_NOPAR)
+void *m_openfirst(void)
   {
     return((void *) stdin) ;
     }

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

@@ -117,7 +117,7 @@ LOGICAL m_attvonly(string)
 
 /* Check a name previously saved in m_saveatt to see if it is the name of
    a valid parameter for the current start tag */
-void m_findatt(M_NOPAR)
+void m_findatt(void)
   {
     int par, i ;
 
@@ -220,7 +220,7 @@ void m_parupper(par, string)
 
 /* Set all parameters to their default values for an element included by
    tag minimization */
-void m_stkdefaultparams(M_NOPAR)
+void m_stkdefaultparams(void)
   {
     int i, par = 0 ;
 
@@ -272,7 +272,7 @@ void m_stkonedef(par, scanel, poccur, i)
     }
 
 /* Stack parameter values */
-void m_stkparams(M_NOPAR)
+void m_stkparams(void)
   {
     int i, par ;
 

cde/programs/dthelp/parser/canon1/parser/parutil.c

@@ -48,7 +48,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "version.h"
 
 /* Adjust parsing state after each token if necessary */
-void m_adjuststate(M_NOPAR)
+void m_adjuststate(void)
   {
     if (m_curcon == START) {
       if (m_netlevel) {
@@ -79,7 +79,7 @@ void m_adjuststate(M_NOPAR)
 
 /* Tests whether the element named in a tag is defined; if so, returns its
    index; otherwise return FALSE */
-M_ELEMENT m_eltname(M_NOPAR)
+M_ELEMENT m_eltname(void)
   {
     M_ELEMENT eltid ;
 
@@ -103,7 +103,7 @@ return i;
 }
 
 /* Program initialization */
-void m_initialize(M_NOPAR)
+void m_initialize(void)
 {
 char    **mb_delims;
 M_WCHAR **wc_delims;

cde/programs/dthelp/parser/canon1/parser/proto.h

@@ -21,9 +21,9 @@
  * Floor, Boston, MA 02110-1301 USA
  */
 /* $XConsortium: proto.h /main/3 1995/11/08 09:42:21 rswiston $ */
-int m_actgetc(M_NOPAR);
+int m_actgetc(void);
 
-void m_adjuststate(M_NOPAR);
+void m_adjuststate(void);
 
 LOGICAL m_allwhite(const M_WCHAR *string);
 
@@ -41,20 +41,20 @@ void m_closent(void *m_ptr);
 
 void m_codeent(int m_ent);
 
-M_PARSE *m_copystackelt(M_NOPAR);
+M_PARSE *m_copystackelt(void);
 
 M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, 
   unsigned char *wheredef);
 
 void m_dispcurelt(M_WCHAR *file, int line);
 
-void m_done(M_NOPAR);
+void m_done(void);
 
 void m_dumpline(M_WCHAR *file, int line);
 
 void m_eduptype(int type);
 
-M_ELEMENT m_eltname(M_NOPAR);
+M_ELEMENT m_eltname(void);
 
 void m_endaction(M_ELEMENT m_elt);
 
@@ -64,7 +64,7 @@ void m_endtag(M_ELEMENT c);
 
 void m_entexpand(M_ENTITY *openent);
 
-void m_eprefix(M_NOPAR);
+void m_eprefix(void);
 
 void m_err1(const char *text, const M_WCHAR *arg);
 
@@ -87,15 +87,15 @@ void m_errline(char *p);
 
 void m_error(char *text);
 
-void m_esuffix(M_NOPAR);
+void m_esuffix(void);
 
 void m_exit(int status);
 
-void m_etcomplete(M_NOPAR);
+void m_etcomplete(void);
 
 LOGICAL m_excluded(M_ELEMENT elt);
 
-void m_expecting(M_NOPAR);
+void m_expecting(void);
 
 void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data);
 
@@ -105,7 +105,7 @@ void m_exptend(LOGICAL *expstart, M_PARSE *stackptr);
 
 int m_findact(M_ELEMENT elt, int *array);
 
-void m_findatt(M_NOPAR);
+void m_findatt(void);
 
 void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, 
   LOGICAL wild);
@@ -116,7 +116,7 @@ M_ELEMENT m_findunique(M_STATE from, int *newleft);
 
 void m_frcend(M_ELEMENT val);
 
-void m_frcstart(M_NOPAR);
+void m_frcstart(void);
 
 void m_free(void *block, char *msg);
 
@@ -141,23 +141,23 @@ void m_getline(M_WCHAR **file, int *line);
 
 void m_getname(M_WCHAR first);
 
-void m_getsignon(M_NOPAR);
+void m_getsignon(void);
 
 int m_gettoken(int *c, M_HOLDTYPE *dchar, int context);
 
-void m_globes(M_NOPAR);
+void m_globes(void);
 
-void m_globss(M_NOPAR);
+void m_globss(void);
 
-void m_holdproc(M_NOPAR);
+void m_holdproc(void);
 
 void m_inctest(int *count, int limit, char *message);
 
-void m_initctype(M_NOPAR);
+void m_initctype(void);
 
-void m_initialize(M_NOPAR);
+void m_initialize(void);
 
-void m_lastchars(M_NOPAR);
+void m_lastchars(void);
 
 int m_level(M_WCHAR *elt);
 
@@ -183,17 +183,17 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LO
 
 void m_ntrent(M_WCHAR *p);
 
-void m_nullendtag(M_NOPAR);
+void m_nullendtag(void);
 
-LOGICAL m_omitend(M_NOPAR);
+LOGICAL m_omitend(void);
 
-LOGICAL m_omitstart(M_NOPAR);
+LOGICAL m_omitstart(void);
 
 void m_openchk(FILE **ptr, char *name, char *mode);
 
 void *m_openent(M_WCHAR *entcontent);
 
-void *m_openfirst(M_NOPAR);
+void *m_openfirst(void);
 
 void m_optstring(char *p);
 
@@ -217,13 +217,13 @@ LOGICAL m_parvalok(M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value);
 
 void m_piaction(M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype);
 
-void m_pop(M_NOPAR);
+void m_pop(void);
 
 void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need);
 
 LOGICAL m_putdata(void *data, int n);
 
-void m_readcomments(M_NOPAR);
+void m_readcomments(void);
 
 void *m_realloc(void *ptr, int size, char *msg);
 
@@ -231,31 +231,31 @@ int m_scan(LOGICAL prolog);
 
 void m_setmap(int map, LOGICAL useoradd);
 
-void m_setoptions(M_NOPAR);
+void m_setoptions(void);
 
 void m_setparam(M_WCHAR **cvar, int par);
 
 void m_shortref(int context);
 
-void m_showcurelt(M_NOPAR);
+void m_showcurelt(void);
 
 void m_signmsg(char *p);
 
-void m_sigre(M_NOPAR);
+void m_sigre(void);
 
-void m_startdoc(M_NOPAR);
+void m_startdoc(void);
 
-void m_startmsg(M_NOPAR);
+void m_startmsg(void);
 
 void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END);
 
-void m_stcomplete(M_NOPAR);
+void m_stcomplete(void);
 
-void m_stkdefaultparams(M_NOPAR);
+void m_stkdefaultparams(void);
 
 void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i);
 
-void m_stkparams(M_NOPAR);
+void m_stkparams(void);
 
 void m_strtaction(M_ELEMENT m_elt);
 
@@ -271,11 +271,11 @@ void m_textaction(M_WCHAR m_textchar);
 
 void m_textout(char *format, LOGICAL start, LOGICAL end);
 
-LOGICAL m_textpermitted(M_NOPAR);
+LOGICAL m_textpermitted(void);
 
-M_WCHAR *m_thisfile(M_NOPAR);
+M_WCHAR *m_thisfile(void);
 
-int m_thisline(M_NOPAR);
+int m_thisline(void);
 
 void m_trace(char *p);
 
@@ -297,7 +297,7 @@ int m_mbmbupstrcmp(const char *p, const char *q);
 
 LOGICAL m_validinpar(M_WCHAR *string);
 
-LOGICAL m_vldentref(M_NOPAR);
+LOGICAL m_vldentref(void);
 
 LOGICAL m_whitespace(M_WCHAR c);
 

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

@@ -51,7 +51,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "sref.h"
 
 /* Actually read a character from an input stream */
-int m_actgetc(M_NOPAR)
+int m_actgetc(void)
   {
     int c ;
 
@@ -690,7 +690,7 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart,
     }
 
 /* Scans past a comment within a markup declaration */
-void m_readcomments(M_NOPAR)
+void m_readcomments(void)
   {
     int c ;
     M_HOLDTYPE dchar ;
@@ -1050,7 +1050,7 @@ while (TRUE)
           or contextual end tag [linestat == M_SOMETHING]
       3)  If a record end might be the last one in an element, save it
 */
-void m_sigre(M_NOPAR)
+void m_sigre(void)
   {
     /* Check for first RE in content and no preceding content */
     if (m_start &&
@@ -1126,7 +1126,7 @@ void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread)
     }
 
 /* Have encountered an M_ERO.  If the entity reference is valid, process it*/
-LOGICAL m_vldentref(M_NOPAR)
+LOGICAL m_vldentref(void)
   {
     M_HOLDTYPE dchar ;
     int next ;

cde/programs/dthelp/parser/canon1/parser/setopt.c

@@ -30,7 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
 
 
 /* Set program options */
-void m_setoptions(M_NOPAR)
+void m_setoptions(void)
   {
     if (m_argc > 1) m_optstring(m_argv[1]) ;
     }

cde/programs/dthelp/parser/canon1/parser/startdoc.c

@@ -32,7 +32,7 @@ Copyright 1989 Hewlett-Packard Co.
    control after all entity declarations have been processed.  Not needed
    in valid documents (when it is called just prior to global start-code),
    but may be useful in some applications nevertheless. */
-void m_startdoc(M_NOPAR)
+void m_startdoc(void)
   {
     }
 

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

@@ -191,7 +191,7 @@ LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet)
 
 /* Make a copy of the stack entry at the top of the parse stack in a scratch
    area */
-M_PARSE *m_copystackelt(M_NOPAR)
+M_PARSE *m_copystackelt(void)
   {
     M_OPENFSA *oldfsa ;
     M_OPENFSA **newfsa ;
@@ -219,7 +219,7 @@ M_PARSE *m_copystackelt(M_NOPAR)
     }
 
 /* End of document */
-void m_done(M_NOPAR)
+void m_done(void)
   {
     M_ELEMENT lastelt ;
 
@@ -398,7 +398,7 @@ LOGICAL m_nextand(thisfsa, label)
     }
 
 /* Pops the parse stack*/
-void m_pop(M_NOPAR)
+void m_pop(void)
   {
     M_PARSE *stackelt ;
 
@@ -664,7 +664,7 @@ void m_strttag(M_ELEMENT val, LOGICAL net)
    makes more sense, is used by MARKUP, and is under consideration by the
    Standards committee; the latter is the current definition in the Standard
    */
-LOGICAL m_textpermitted(M_NOPAR)
+LOGICAL m_textpermitted(void)
   {
     M_ANDGROUP pand ;
     M_OPENFSA *fsastack ;

cde/programs/dthelp/parser/canon1/util/basic.h

@@ -47,8 +47,6 @@ typedef wchar_t M_WCHAR;
 /* For function prototypes */
 typedef char * M_POINTER;
 
-#define M_NOPAR void
-
 char *MakeMByteString(const M_WCHAR *from);
 
 M_WCHAR *MakeWideCharString(const char *from);

cde/programs/dthelp/parser/canon1/util/cont.h

@@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 void countdown(M_TRIE *parent, int *count);
 
-void dumpdlmptr(M_NOPAR);
+void dumpdlmptr(void);
 
 void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc));
 
@@ -53,17 +53,17 @@ void m_err1(char *text, char *arg);
 
 void getcode(int n);
 
-void getcolon(M_NOPAR);
+void getcolon(void);
 
-int getContext(M_NOPAR);
+int getContext(void);
 
-LOGICAL getdname(M_NOPAR);
+LOGICAL getdname(void);
 
-void inccon(M_NOPAR);
+void inccon(void);
 
-void incdelim(M_NOPAR);
+void incdelim(void);
 
-void loaddelim(M_NOPAR);
+void loaddelim(void);
 
 int m_lower(int c);
 
@@ -81,7 +81,7 @@ void prtctxt(int column, int value);
 
 int readchar(LOGICAL cap);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 void unread(int c);
 

cde/programs/dthelp/parser/canon1/util/conutil.c

@@ -40,7 +40,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "cont.h"
 
 /* Output declaration of dlmptr */
-void dumpdlmptr(M_NOPAR)
+void dumpdlmptr(void)
   {
     int n;
 
@@ -216,7 +216,7 @@ while (TRUE)
 } /* End proc getcode() */
 
 /* Read the colon separating the two states in a transition pair */
-void getcolon(M_NOPAR)
+void getcolon(void)
 {
 int c ; /* c is int instead of char for use with ungetc */
 M_WCHAR wcl;
@@ -240,7 +240,7 @@ if (c != wcl)
 }
 
 /* Read a context name from an input line */
-int getContext(M_NOPAR)
+int getContext(void)
 {
 M_WCHAR name[CNAMELEN + 1];
 int c ; /* c is int instead of char for use with ungetc */
@@ -309,7 +309,7 @@ return(ccount - 1);
 }
 
 /* Read a delimiter name from the input line */
-LOGICAL getdname(M_NOPAR)
+LOGICAL getdname(void)
 {
 int c;
 M_WCHAR *p;
@@ -353,7 +353,7 @@ return(TRUE);
 }
 
 /* Out of context space.  Increase. */
-void inccon(M_NOPAR)
+void inccon(void)
   {
     M_TRIE **newtrie = NULL;
     int *newtransit = NULL;
@@ -400,7 +400,7 @@ void inccon(M_NOPAR)
     }
 
 /* Increase delimiter space. */
-void incdelim(M_NOPAR)
+void incdelim(void)
 {
 int *newtransit = NULL;
 char **newdlm = NULL;
@@ -448,7 +448,7 @@ dcount++;
 }
 
 /* Read delimiter definitions from delim.dat */
-void loaddelim(M_NOPAR)
+void loaddelim(void)
 {
 int c;
 M_WCHAR *p;
@@ -654,7 +654,7 @@ return(c);
 
 /* Called by utility procedure m_error() -- has content in other programs
    that use m_error() */
-void skiptoend(M_NOPAR)
+void skiptoend(void)
 {
 }
 

cde/programs/dthelp/parser/canon1/util/error.c

@@ -56,7 +56,7 @@ void msgline(char *text);
 
 void msg1line(char *text, char *arg1);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 void m_wctrace(M_WCHAR *text);
 
@@ -185,7 +185,7 @@ m_free(mb_arg5,"multi-byte string");
 }
 
 /* Write error message suffix */
-void esuffix(M_NOPAR)
+void esuffix(void)
   {
     fprintf(stderr, " (line %d) ****\n", m_line) ;
     fprintf(m_errfile, " (line %d) ****\n", m_line) ;

cde/programs/dthelp/parser/canon1/util/initct.c

@@ -29,7 +29,7 @@
 #include "common.h"
 extern char m_chartype[M_CHARSETLEN] ;
 
-void m_initctype(M_NOPAR)
+void m_initctype(void)
   {
     int i ;
 

cde/programs/dthelp/parser/canon1/util/malloc.c

@@ -42,7 +42,7 @@ void m_exit(int status);
 
 void m_free(void *block, char *msg);
 
-void m_heapdump(M_NOPAR);
+void m_heapdump(void);
 
 void *m_malloc(int size, char *msg);
 
@@ -81,7 +81,7 @@ void m_free(block, msg)
     }
 
 #if defined(MSDOS)
-void m_heapdump(M_NOPAR)
+void m_heapdump(void)
   {
     struct _heapinfo hinfo ;
     int heapstatus ;

cde/programs/dthelp/parser/canon1/util/scanutil.c

@@ -28,7 +28,7 @@
 extern FILE *ifile;
 
 /* Getachar returns the next character from the input stream */
-int getachar(M_NOPAR)
+int getachar(void)
 {
 int  c;
 M_WCHAR wc,wnl;

cde/programs/dthelp/parser/canon1/util/trie.c

@@ -85,7 +85,7 @@ void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c)
    } /* end entertree */
 
 /* Gets a new node for a trie */
-M_TRIE *m_gettrienode(M_NOPAR)
+M_TRIE *m_gettrienode(void)
   {
     M_TRIE *new ;
 

cde/programs/dthelp/parser/canon1/util/trie.h

@@ -51,7 +51,7 @@ struct m_ptrie {
   } ;
 
 
-M_TRIE *m_gettrienode(M_NOPAR);
+M_TRIE *m_gettrienode(void);
 
 void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie);
 

cde/programs/dthelp/parser/pass1/build/buildutl.c

@@ -62,7 +62,7 @@ if (*flag)
 }
 
 /* Program initialization */
-void initialize(M_NOPAR)
+void initialize(void)
 {
 char    **mb_delims;
 M_WCHAR **wc_delims;
@@ -90,7 +90,7 @@ ruleinit() ;
 
 
 /* Initialization before starting a new rule */
-void ruleinit(M_NOPAR)
+void ruleinit(void)
   {
     /* Reinitialize for next rule */
     lhs = NULL ;
@@ -110,7 +110,7 @@ void ruleinit(M_NOPAR)
     }
 
 /* Rule end processing */
-void rulend(M_NOPAR)
+void rulend(void)
   {
     STATE *fsa = NULL ;
     LOGICAL canbenull ;
@@ -150,7 +150,7 @@ void rulend(M_NOPAR)
     }
 
 /* Skip rest of statement after an error */
-void skiptoend(M_NOPAR)
+void skiptoend(void)
   {
     int i ;
     static int errlev = 0 ;

cde/programs/dthelp/parser/pass1/build/except.c

@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "build.h"
 
 /* Add an exception (inclusion or exclusion) for the current element */
-void addex(M_NOPAR)
+void addex(void)
   {
     excount++ ;
     *nextex = (EXCEPTION *) m_malloc(sizeof(EXCEPTION), "exception") ;

cde/programs/dthelp/parser/pass1/build/fsa.c

@@ -176,7 +176,7 @@ void dellist(list)
 
 /* Delstartarcs deletes the contents of the starta list of arcs from start
    states of a submodel */
-void delstartarcs(M_NOPAR)
+void delstartarcs(void)
   {
     ARC *arcptr ;
     ARC *discard ;
@@ -190,7 +190,7 @@ void delstartarcs(M_NOPAR)
     }
 
 /* Getand allocates and initializes a new andgroup structure */
-ANDGROUP *getand(M_NOPAR)
+ANDGROUP *getand(void)
   {
     ANDGROUP *new ;
 
@@ -203,7 +203,7 @@ ANDGROUP *getand(M_NOPAR)
     }    
 
 /* Getstate obtains an FSA state */
-STATE *getstate(M_NOPAR)
+STATE *getstate(void)
   {
     STATE *new ;
 
@@ -477,7 +477,7 @@ LOGICAL permitspcd(a)
 
 /* Pop pops the submodel stack when the end of the current submodel is
    encountered */
-void pop(M_NOPAR)
+void pop(void)
   {
     STACK *discard ;
 
@@ -493,7 +493,7 @@ void pop(M_NOPAR)
     }
 
 /* Push pushes the submodel stack when a new group is encountered */
-void push(M_NOPAR)
+void push(void)
   {
     STACK *new ;
 
@@ -647,7 +647,7 @@ void savelhs(LOGICAL param)
 /* Called when arcs are added to the start state of a submodel that is
    also a start state of the parent model to set the parent model's
    starta list */
-void savestartarcs(M_NOPAR)
+void savestartarcs(void)
   {
     ARC *carcptr, *parcptr ;
 

cde/programs/dthelp/parser/pass1/build/out.c

@@ -87,7 +87,7 @@ char *deftype(n)
     }
 
 /* Called after all input is read to generate output */
-void done(M_NOPAR)
+void done(void)
   {
 
     if (! eltree.data) {
@@ -167,7 +167,7 @@ void eltblocks(tempfile)
 
 
 /* Writes data about elements */
-void eltreeout(M_NOPAR)
+void eltreeout(void)
   {
     M_WCHAR *p ;
     int enameindex = 0 ;
@@ -245,7 +245,7 @@ char *enttype(n)
     }
 
 /* Outputs exception lists */
-void exout(M_NOPAR)
+void exout(void)
   {
     EXCEPTION *ex ;
     int exindex = 0 ;
@@ -268,7 +268,7 @@ void exout(M_NOPAR)
     }
 
 /* Outputs FSA definitions */
-void fsa(M_NOPAR)
+void fsa(void)
   {
     int arcount = 0 ;
     STATE *pstate ;
@@ -331,7 +331,7 @@ void fsa(M_NOPAR)
     }
 
 /* Writes data about parameters */
-void parout(M_NOPAR)
+void parout(void)
 {
 PARAMETER *paramp ;
 LOGICAL first = TRUE ;
@@ -480,7 +480,7 @@ char *partype(n)
     }
 
 /* Write short reference information */
-void srefout(M_NOPAR)
+void srefout(void)
   {
     LOGICAL first = TRUE ;
     int *mapbysref = NULL;
@@ -629,7 +629,7 @@ fputs("  <END-STRING><\\END-STRING>\n", tempfile) ;
 }
 
 /* Write template */
-void template(M_NOPAR)
+void template(void)
   {
     FILE *tempfile ;
     M_ENTITY *ent ;

cde/programs/dthelp/parser/pass1/build/param.c

@@ -38,7 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Add a keyword to the list of possible values of a keyword parameter for
    the current element
 */
-void addkeyword(M_NOPAR)
+void addkeyword(void)
 {
 int length ;
 PARAMETER *par ;
@@ -87,7 +87,7 @@ ptypelen++ ;
 }
 
 /* Add a parameter to the current element */
-void addpar(M_NOPAR)
+void addpar(void)
 {
 PARAMETER *paramp, *last  = NULL ;
 int length ;
@@ -263,7 +263,7 @@ switch (newpar->type)
 }
 
 /* Called at end of parameter attribute list rule */
-void prulend(M_NOPAR)
+void prulend(void)
 {
 LHS *lhsp ;
 LHS *discard ;

cde/programs/dthelp/parser/pass1/build/proto.h

@@ -35,15 +35,15 @@ void adddefent(M_WCHAR *mapname);
 
 LOGICAL addent(M_WCHAR *name);
 
-void addex(M_NOPAR);
+void addex(void);
 
-void addkeyword(M_NOPAR);
+void addkeyword(void);
 
 LOGICAL addmapname(M_WCHAR *p, LOGICAL define);
 
 void addndent(M_WCHAR *p);
 
-void addpar(M_NOPAR);
+void addpar(void);
 
 void addsref(M_WCHAR *p);
 
@@ -62,15 +62,15 @@ void copyintolist(STATELIST *from, STATELIST **to);
 
 void countdown(M_TRIE *parent, int *count);
 
-void defmapname(M_NOPAR);
+void defmapname(void);
 
 char *deftype(int n);
 
 void dellist(STATELIST **list);
 
-void delstartarcs(M_NOPAR);
+void delstartarcs(void);
 
-void done(M_NOPAR);
+void done(void);
 
 void dumpentnode(FILE *file, M_TRIE *value);
 
@@ -90,9 +90,9 @@ void m_dumptrie(FILE   *file,
 
 void eltblocks(FILE *tempfile);
 
-void eltreeout(M_NOPAR);
+void eltreeout(void);
 
-void endmodel(M_NOPAR);
+void endmodel(void);
 
 void entout(char *fname);
 
@@ -106,7 +106,7 @@ void m_mberr1(char *text, const char *arg);
 
 void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
 
-void exout(M_NOPAR);
+void exout(void);
 
 void m_free(void *block, char *msg);
 
@@ -114,23 +114,23 @@ void freetree(TREE *ruletree);
 
 void found(LOGICAL *flag, char *delim);
 
-void fsa(M_NOPAR);
+void fsa(void);
 
-int getachar(M_NOPAR);
+int getachar(void);
 
-ANDGROUP *getand(M_NOPAR);
+ANDGROUP *getand(void);
 
 LOGICAL getname(int first);
 
-STATE *getstate(M_NOPAR);
+STATE *getstate(void);
 
 int gettoken(int *c, int context);
 
-TREE *gettreenode(M_NOPAR);
+TREE *gettreenode(void);
 
-void m_initctype(M_NOPAR);
+void m_initctype(void);
 
-void initialize(M_NOPAR);
+void initialize(void);
 
 LOGICAL litproc(int delim);
 
@@ -160,49 +160,49 @@ ELTSTRUCT *ntrelt(M_WCHAR *p);
 
 void m_openchk(FILE **ptr, char *name, char *mode);
 
-void parout(M_NOPAR);
+void parout(void);
 
 char *partype(int n);
 
 LOGICAL permitspcd(ARC *a);
 
-void pop(M_NOPAR);
+void pop(void);
 
-void prulend(M_NOPAR);
+void prulend(void);
 
-void push(M_NOPAR);
+void push(void);
 
 LOGICAL regenerate(TREE *start, TREE *stop);
 
 void repeat(TREE *root);
 
-void ruleinit(M_NOPAR);
+void ruleinit(void);
 
-void rulend(M_NOPAR);
+void rulend(void);
 
 LOGICAL samelabelarc(ARC *a, STATE *s);
 
 void savelhs(LOGICAL param);
 
-void savestartarcs(M_NOPAR);
+void savestartarcs(void);
 
-int scan(M_NOPAR);
+int scan(void);
 
 void setdefault(const M_WCHAR *string);
 
 void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional);
 
-void skiptoend(M_NOPAR);
+void skiptoend(void);
 
 int m_sprscon(int i, int j);
 
-void srefout(M_NOPAR);
+void srefout(void);
 
 STATE *startfsa(TREE *root, LOGICAL *canbenull);
 
 void tempelt(ELTSTRUCT *eltp, FILE *tempfile);
 
-void template(M_NOPAR);
+void template(void);
 
 char *typecon(int n);
 

cde/programs/dthelp/parser/pass1/build/scan.c

@@ -74,7 +74,7 @@ return(TRUE);
 }
 
 /* Returns the next token to the main procedure */
-int scan(M_NOPAR)
+int scan(void)
 {
 int c;
 int n;

cde/programs/dthelp/parser/pass1/build/sref.c

@@ -192,7 +192,7 @@ delim->data = thissref;
 
 /* Prefix left-hand side with "M-" to create default short reference map
    name, truncating to M_NAMELEN characters if necessary */
-void defmapname(M_NOPAR)
+void defmapname(void)
 {
 if (!wc_prefix)
     {

cde/programs/dthelp/parser/pass1/build/tree.c

@@ -36,7 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Called after a right parenthesis is read while scanning a content model.
    Resets curcon if it is the outermost submodel. */
-void endmodel(M_NOPAR)
+void endmodel(void)
   {
     curtree = curtree->parent ;
     if (! curtree->parent) curcon = LASTM ;
@@ -58,7 +58,7 @@ void freetree(treep)
     }
 
 /* Gettreenode obtains a node to use in the tree representation of a rule */
-TREE *gettreenode(M_NOPAR)
+TREE *gettreenode(void)
   {
     TREE *new ;
 

cde/programs/dthelp/parser/pass1/eltdef/context.dat

@@ -398,7 +398,7 @@ tagc
   postent:start
   codetagc:inentc {
             startcode(entity->codeindex, &inent, entfile,
-                      "c", nopar, nopar, "") ;
+                      "c", "void", "void", "") ;
             }
   close:preparam
   sschain:inss {
@@ -420,11 +420,11 @@ tagc
             }
   scchain:insc {
             *getaction(scarray) = ++sactions ;
-            startcode(sactions, &insc, sfile, "s", nopar, nopar, "") ;
+            startcode(sactions, &insc, sfile, "s", "void", "void", "") ;
             }
   ecchain:inec {
             *getaction(ecarray) = ++eactions ;
-            startcode(eactions, &inec, efile, "e", nopar, nopar, "") ;
+            startcode(eactions, &inec, efile, "e", "void", "void", "") ;
             }
   stcchain:instc {
             *getaction(stcarray) = ++stactions ;

cde/programs/dthelp/parser/pass1/eltdef/eltdef.h

@@ -215,7 +215,6 @@ ELTEXTERN int restart ELTINIT(RENTITY) ;
 #define stproto "M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END"
 #define stformal "m_string, M_START, M_END"
 #define stft "  M_WCHAR *m_string ;\n  LOGICAL M_START ;\n  LOGICAL M_END ;\n"
-#define nopar "M_NOPAR"
 
 /* Structures for generating defines for parameter values */
 ELTEXTERN M_TRIE parval ;

cde/programs/dthelp/parser/pass1/eltdef/eltutil.c

@@ -92,7 +92,7 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto)
 
 /* Called when the C identifier to be #define'd to a parameter value is
    scanned */
-void cvalue(M_NOPAR)
+void cvalue(void)
   {
     PARVAL *new;
 
@@ -111,18 +111,18 @@ void cvalue(M_NOPAR)
 
 /* Called after last input character is read to place closing punctuation
    at end of output files and close them */
-void done(M_NOPAR)
+void done(void)
   {
     M_ENTITY *ent;
     ACTION *actp;
     LOGICAL first;
     int i;
 
-    closeiffile(inent, entfile, codeent, "c", nopar);
+    closeiffile(inent, entfile, codeent, "c", "void");
     closeiffile(intext, tfile, tactions, "t", tproto);
     closeiffile(inpc, pfile, pactions, "p", pproto);
-    closeiffile(insc, sfile, sactions, "s", nopar);
+    closeiffile(insc, sfile, sactions, "s", "void");
-    closeiffile(inec, efile, eactions, "e", nopar);
+    closeiffile(inec, efile, eactions, "e", "void");
     closeiffile(instc, stfile, stactions, "st", stproto);
 
     endstring();
@@ -190,7 +190,7 @@ void endcode(LOGICAL flag, FILE *file)
     }
 
 /* Called at the end of all initial fields in the interface definition */
-void endini(M_NOPAR)
+void endini(void)
   {
     if (finitext) 
       fputs("    putc(m_textchar, m_outfile);\n", tfile);
@@ -209,7 +209,7 @@ void endini(M_NOPAR)
 
 /* End the sign-on message */
 #include <time.h>
-void endsignon(M_NOPAR)
+void endsignon(void)
   {
     time_t storetime;
     char *p;
@@ -255,7 +255,7 @@ void endsignon(M_NOPAR)
     }
 
 /* Closes a start-string or end-string */
-void endstring(M_NOPAR)
+void endstring(void)
   {
     if (instring) {
       if (stringstart) stringstart = FALSE;
@@ -282,7 +282,7 @@ void enttype(type)
     }
 
 /* Free storage used for a context-specification chain */
-void freechain(M_NOPAR)
+void freechain(void)
   {
     CHAIN *chainp, *dchainp;
 
@@ -333,7 +333,7 @@ int *getaction(array)
     }
 
 /* Allocate new action structure */
-ACTION *getactstruct(M_NOPAR)
+ACTION *getactstruct(void)
   {
     ACTION *new;
 
@@ -347,7 +347,7 @@ ACTION *getactstruct(M_NOPAR)
     }
 
 /* Program initialization */
-void initialize(M_NOPAR)
+void initialize(void)
 {
 char    **mb_delims;
 M_WCHAR **wc_delims;
@@ -411,13 +411,13 @@ fputs("#endif\n", ifh);
 
 startcode(pactions, &inpc, pfile, "p", pproto, pformal, pftype);
 startcode(tactions, &intext, tfile, "t", tproto, tformal, tftype);
-startcode(sactions, &insc, sfile, "s", nopar, nopar, "");
+startcode(sactions, &insc, sfile, "s", "void", "void", "");
-startcode(eactions, &inec, efile, "e", nopar, nopar, "");
+startcode(eactions, &inec, efile, "e", "void", "void", "");
 startcode(stactions, &instc, stfile, "st", stproto, stformal, stft);
 }
 
 /* Output definitions for strings */
-void outstring(M_NOPAR)
+void outstring(void)
   {
     int c;
 
@@ -480,7 +480,7 @@ for ( ; p ; p = p->next)
 }
 
 /* Skip rest of statement after an error */
-void skiptoend(M_NOPAR)
+void skiptoend(void)
   {
     int i;
     static int errlev = 0;
@@ -580,7 +580,7 @@ fprintf(file, "{\n/* line %d \"%s\" */\n", m_line, iffile); /* balance "}" */
 }
 
 /* Begins processing a new element */
-void startelement(M_NOPAR)
+void startelement(void)
   {
     CVARSTRUCT *cvarp;
     CVARSTRUCT *discard;
@@ -601,7 +601,7 @@ void startelement(M_NOPAR)
     }
 
 /* Stores the name of a C variable read from the input file */
-void storecvar(M_NOPAR)
+void storecvar(void)
   {
     CVARSTRUCT *new;
 
@@ -616,7 +616,7 @@ void storecvar(M_NOPAR)
 /* Compares the parameter name associated with a C variable in the input
    file with the names of all parameters of the current element.  Stores
    result for later output with code segments */
-void storepname(M_NOPAR)
+void storepname(void)
   {
     int i, par;