This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[PATCH RFC] Protoize tui/*.c


The patches below were generated automatically and "protoize" the C
source files in tui.  If you glance at the patches, you'll notice that
these sources were already protoized and that only the old K&R style
declarations were removed along with the corresponding __STDC__
ifdefs.  (The remaining, already protized, function declarators are
reformatted too where appropriate.)  I will post the script used to do
the conversion as a reply to this message.

Since this set of patches is rather large, I'll wait at least a week
for comments before committing it.  I.e, I'll commit this patch
sometime after Wed, November 22.

	* tui.c, tuiCommand.c, tuiData.c, tuiDataWin.c, tuiDisassem.c,
	tuiGeneralWin.c, tuiIO.c, tuiLayout.c, tuiRegs.c, tuiSource.c,
	tuiSourceWin.c, tuiStack.c, tuiWin.c: Remove K&R style function
	declarators and corresponding ifdefs leaving only the ISO-C
	style function declarator.

Index: tui/tui.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui.c,v
retrieving revision 1.4
diff -u -r1.4 tui.c
--- tui.c	2000/07/30 01:48:28	1.4
+++ tui.c	2000/11/16 00:30:50
@@ -59,12 +59,7 @@
    ** tuiInit().
  */
 void
-#ifdef __STDC__
 tuiInit (char *argv0)
-#else
-tuiInit (argv0)
-     char *argv0;
-#endif
 {
   extern void init_page_info ();
 extern void initialize_tui_files (void);
@@ -97,11 +92,7 @@
    ** tuiInitWindows().
  */
 void
-#ifdef __STDC__
 tuiInitWindows (void)
-#else
-tuiInitWindows ()
-#endif
 {
   TuiWinType type;
 
@@ -122,11 +113,7 @@
    **        Kill signal handler and cleanup termination method
  */
 void
-#ifdef __STDC__
 tuiResetScreen (void)
-#else
-tuiResetScreen ()
-#endif
 {
   TuiWinType type = SRC_WIN;
 
@@ -154,11 +141,7 @@
    **        Kill signal handler and cleanup termination method
  */
 void
-#ifdef __STDC__
 tuiCleanUp (void)
-#else
-tuiCleanUp ()
-#endif
 {
   char *buffer;
   extern char *term_cursor_move;
@@ -180,15 +163,7 @@
    ** tuiError().
  */
 void
-#ifdef __STDC__
-tuiError (
-	   char *string,
-	   int exitGdb)
-#else
-tuiError (string, exitGdb)
-     char *string;
-     int exitGdb;
-#endif
+tuiError (char *string, int exitGdb)
 {
   puts_unfiltered (string);
   if (exitGdb)
@@ -206,13 +181,7 @@
    **        tuiError with args in a va_list.
  */
 void
-#ifdef __STDC__
-tui_vError (
-	     va_list args)
-#else
-tui_vError (args)
-     va_list args;
-#endif
+tui_vError (va_list args)
 {
   char *string;
   int exitGdb;
@@ -231,13 +200,7 @@
    **    Wrapper on top of free() to ensure that input address is greater than 0x0
  */
 void
-#ifdef __STDC__
-tuiFree (
-	  char *ptr)
-#else
-tuiFree (ptr)
-     char *ptr;
-#endif
+tuiFree (char *ptr)
 {
   if (ptr != (char *) NULL)
     {
@@ -254,15 +217,7 @@
    **        low address input.
  */
 Opaque
-#ifdef __STDC__
-tuiGetLowDisassemblyAddress (
-			      Opaque low,
-			      Opaque pc)
-#else
-tuiGetLowDisassemblyAddress (low, pc)
-     Opaque low;
-     Opaque pc;
-#endif
+tuiGetLowDisassemblyAddress (Opaque low, Opaque pc)
 {
   int line;
   Opaque newLow;
@@ -291,13 +246,7 @@
    **        disassembly window with args in a va_list.
  */
 Opaque
-#ifdef __STDC__
-tui_vGetLowDisassemblyAddress (
-				va_list args)
-#else
-tui_vGetLowDisassemblyAddress (args)
-     va_list args;
-#endif
+tui_vGetLowDisassemblyAddress (va_list args)
 {
   int line;
   Opaque newLow;
@@ -328,14 +277,7 @@
    **       be replaced by judicious use of QUIT.
  */
 Opaque
-#ifdef __STDC__
-tuiDo (
-	TuiOpaqueFuncPtr func,...)
-#else
-tuiDo (func, va_alist)
-     TuiOpaqueFuncPtr func;
-     va_dcl
-#endif
+tuiDo (TuiOpaqueFuncPtr func,...)
 {
   extern int terminal_is_ours;
 
@@ -382,14 +324,7 @@
    **
  */
 Opaque
-#ifdef __STDC__
-tuiDoAndReturnToTop (
-		      TuiOpaqueFuncPtr func,...)
-#else
-tuiDoAndReturnToTop (func, va_alist)
-     TuiOpaqueFuncPtr func;
-     va_dcl
-#endif
+tuiDoAndReturnToTop (TuiOpaqueFuncPtr func,...)
 {
   extern int terminal_is_ours;
 
@@ -421,13 +356,7 @@
 
 
 void
-#ifdef __STDC__
-tui_vSelectSourceSymtab (
-			  va_list args)
-#else
-tui_vSelectSourceSymtab (args)
-     va_list args;
-#endif
+tui_vSelectSourceSymtab (va_list args)
 {
   struct symtab *s = va_arg (args, struct symtab *);
 
@@ -483,15 +412,7 @@
    **       be replaced by judicious use of QUIT.
  */
 Opaque
-#ifdef __STDC__
-va_catch_errors (
-		  TuiOpaqueFuncPtr func,
-		  va_list args)
-#else
-va_catch_errors (func, args)
-     TuiOpaqueFuncPtr func;
-     va_list args;
-#endif
+va_catch_errors (TuiOpaqueFuncPtr func, va_list args)
 {
   Opaque ret = (Opaque) NULL;
 
@@ -541,18 +462,7 @@
    **        argument list as well.
  */
 Opaque
-#ifdef __STDC__
-vcatch_errors (
-		OpaqueFuncPtr func,...)
-#else
-vcatch_errors (va_alist)
-     va_dcl
-/*
-   vcatch_errors(func, va_alist)
-   OpaqueFuncPtr    func;
-   va_dcl
- */
-#endif
+vcatch_errors (OpaqueFuncPtr func,...)
 {
   Opaque ret = (Opaque) NULL;
   va_list args;
@@ -575,17 +485,7 @@
 
 
 void
-#ifdef __STDC__
-strcat_to_buf (
-		char *buf,
-		int buflen,
-		char *itemToAdd)
-#else
-strcat_to_buf (buf, buflen, itemToAdd)
-     char *buf;
-     int buflen;
-     char *itemToAdd;
-#endif
+strcat_to_buf (char *buf, int buflen, char *itemToAdd)
 {
   if (itemToAdd != (char *) NULL && buf != (char *) NULL)
     {
@@ -657,15 +557,7 @@
    **       be replaced by judicious use of QUIT.
  */
 static Opaque
-#ifdef __STDC__
-_tui_vDo (
-	   TuiOpaqueFuncPtr func,
-	   va_list args)
-#else
-_tui_vDo (func, args)
-     TuiOpaqueFuncPtr func;
-     va_list args;
-#endif
+_tui_vDo (TuiOpaqueFuncPtr func, va_list args)
 {
   extern int terminal_is_ours;
 
@@ -696,15 +588,7 @@
 
 
 static void
-#ifdef __STDC__
-_toggle_command (
-		  char *arg,
-		  int fromTTY)
-#else
-_toggle_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_toggle_command (char *arg, int fromTTY)
 {
   printf_filtered ("Specify feature to toggle.\n%s\n",
 		   (tui_version) ? TUI_TOGGLE_USAGE : TOGGLE_USAGE);
@@ -717,13 +601,7 @@
    ** _tui_vToggle_command().
  */
 static void
-#ifdef __STDC__
-_tui_vToggle_command (
-		       va_list args)
-#else
-_tui_vToggle_command (args)
-     va_list args;
-#endif
+_tui_vToggle_command (va_list args)
 {
   char *arg;
   int fromTTY;
@@ -755,11 +633,7 @@
 
 
 static void
-#ifdef __STDC__
 _tuiReset (void)
-#else
-_tuiReset ()
-#endif
 {
   struct termio mode;
 
Index: tui/tuiCommand.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiCommand.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 tuiCommand.c
--- tuiCommand.c	1999/07/07 20:19:10	1.1.1.2
+++ tuiCommand.c	2000/11/16 00:30:50
@@ -26,13 +26,7 @@
    **        Dispatch the correct tui function based upon the control character.
  */
 unsigned int
-#ifdef __STDC__
-tuiDispatchCtrlChar (
-		      unsigned int ch)
-#else
-tuiDispatchCtrlChar (ch)
-     unsigned int ch;
-#endif
+tuiDispatchCtrlChar (unsigned int ch)
 {
   TuiWinInfoPtr winInfo = tuiWinWithFocus ();
 
@@ -114,13 +108,7 @@
    **     checking for overflow.  Returns the new value of the char count.
  */
 int
-#ifdef __STDC__
-tuiIncrCommandCharCountBy (
-			    int count)
-#else
-tuiIncrCommandCharCountBy (count)
-     int count;
-#endif
+tuiIncrCommandCharCountBy (int count)
 {
   if (tui_version)
     {
@@ -141,13 +129,7 @@
    **     checking for overflow.  Returns the new value of the char count.
  */
 int
-#ifdef __STDC__
-tuiDecrCommandCharCountBy (
-			    int count)
-#else
-tuiDecrCommandCharCountBy (count)
-     int count;
-#endif
+tuiDecrCommandCharCountBy (int count)
 {
   if (tui_version)
     {
@@ -167,13 +149,7 @@
    **     Set the character count to count.
  */
 int
-#ifdef __STDC__
-tuiSetCommandCharCountTo (
-			   int count)
-#else
-tuiSetCommandCharCountTo (count)
-     int count;
-#endif
+tuiSetCommandCharCountTo (int count)
 {
   if (tui_version)
     {
@@ -196,11 +172,7 @@
    **     Clear the character count to count.
  */
 int
-#ifdef __STDC__
 tuiClearCommandCharCount (void)
-#else
-tuiClearCommandCharCount ()
-#endif
 {
   if (tui_version)
     cmdWin->detail.commandInfo.curch = 0;
Index: tui/tuiData.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiData.c,v
retrieving revision 1.2
diff -u -r1.2 tuiData.c
--- tuiData.c	2000/05/28 01:12:42	1.2
+++ tuiData.c	2000/11/16 00:30:52
@@ -68,11 +68,7 @@
    **        Answer a whether the terminal window has been resized or not
  */
 int
-#ifdef __STDC__
 tuiWinResized (void)
-#else
-tuiWinResized ()
-#endif
 {
   return _winResized;
 }				/* tuiWinResized */
@@ -83,13 +79,7 @@
    **        Set a whether the terminal window has been resized or not
  */
 void
-#ifdef __STDC__
-tuiSetWinResizedTo (
-		     int resized)
-#else
-tuiSetWinResizedTo (resized)
-     int resized;
-#endif
+tuiSetWinResizedTo (int resized)
 {
   _winResized = resized;
 
@@ -102,11 +92,7 @@
    **        Answer a pointer to the current layout definition
  */
 TuiLayoutDefPtr
-#ifdef __STDC__
 tuiLayoutDef (void)
-#else
-tuiLayoutDef ()
-#endif
 {
   return &_layoutDef;
 }				/* tuiLayoutDef */
@@ -117,11 +103,7 @@
    **        Answer the window with the logical focus
  */
 TuiWinInfoPtr
-#ifdef __STDC__
 tuiWinWithFocus (void)
-#else
-tuiWinWithFocus ()
-#endif
 {
   return _winWithFocus;
 }				/* tuiWinWithFocus */
@@ -132,13 +114,7 @@
    **        Set the window that has the logical focus
  */
 void
-#ifdef __STDC__
-tuiSetWinWithFocus (
-		     TuiWinInfoPtr winInfo)
-#else
-tuiSetWinWithFocus (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiSetWinWithFocus (TuiWinInfoPtr winInfo)
 {
   _winWithFocus = winInfo;
 
@@ -151,11 +127,7 @@
    **        Answer the length in chars, of tabs
  */
 int
-#ifdef __STDC__
 tuiDefaultTabLen (void)
-#else
-tuiDefaultTabLen ()
-#endif
 {
   return _defaultTabLen;
 }				/* tuiDefaultTabLen */
@@ -166,13 +138,7 @@
    **        Set the length in chars, of tabs
  */
 void
-#ifdef __STDC__
-tuiSetDefaultTabLen (
-		      int len)
-#else
-tuiSetDefaultTabLen (len)
-     int len;
-#endif
+tuiSetDefaultTabLen (int len)
 {
   _defaultTabLen = len;
 
@@ -187,11 +153,7 @@
    **        be displayed at the same time.
  */
 TuiListPtr
-#ifdef __STDC__
 sourceWindows (void)
-#else
-sourceWindows ()
-#endif
 {
   return &_sourceWindows;
 }				/* currentSourceWindows */
@@ -204,11 +166,7 @@
    **        displayed at the same time.
  */
 void
-#ifdef __STDC__
 clearSourceWindows (void)
-#else
-clearSourceWindows ()
-#endif
 {
   _sourceWindows.list[0] = (Opaque) NULL;
   _sourceWindows.list[1] = (Opaque) NULL;
@@ -223,11 +181,7 @@
    **        Clear the pertinant detail in the source windows.
  */
 void
-#ifdef __STDC__
 clearSourceWindowsDetail (void)
-#else
-clearSourceWindowsDetail ()
-#endif
 {
   int i;
 
@@ -245,13 +199,7 @@
    **       both can be displayed at the same time.
  */
 void
-#ifdef __STDC__
-addToSourceWindows (
-		     TuiWinInfoPtr winInfo)
-#else
-addToSourceWindows (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+addToSourceWindows (TuiWinInfoPtr winInfo)
 {
   if (_sourceWindows.count < 2)
     _sourceWindows.list[_sourceWindows.count++] = (Opaque) winInfo;
@@ -265,13 +213,7 @@
    **        Clear the pertinant detail in the windows.
  */
 void
-#ifdef __STDC__
-clearWinDetail (
-		 TuiWinInfoPtr winInfo)
-#else
-clearWinDetail (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+clearWinDetail (TuiWinInfoPtr winInfo)
 {
   if (m_winPtrNotNull (winInfo))
     {
@@ -312,11 +254,7 @@
    **        Accessor for the blank string.
  */
 char *
-#ifdef __STDC__
 blankStr (void)
-#else
-blankStr ()
-#endif
 {
   return _tuiBlankStr;
 }				/* blankStr */
@@ -327,11 +265,7 @@
    **        Accessor for the location string.
  */
 char *
-#ifdef __STDC__
 locationStr (void)
-#else
-locationStr ()
-#endif
 {
   return _tuiLocationStr;
 }				/* locationStr */
@@ -342,11 +276,7 @@
    **        Accessor for the break string.
  */
 char *
-#ifdef __STDC__
 breakStr (void)
-#else
-breakStr ()
-#endif
 {
   return _tuiBreakStr;
 }				/* breakStr */
@@ -357,11 +287,7 @@
    **        Accessor for the breakLocation string.
  */
 char *
-#ifdef __STDC__
 breakLocationStr (void)
-#else
-breakLocationStr ()
-#endif
 {
   return _tuiBreakLocationStr;
 }				/* breakLocationStr */
@@ -372,11 +298,7 @@
    **        Accessor for the null string.
  */
 char *
-#ifdef __STDC__
 nullStr (void)
-#else
-nullStr ()
-#endif
 {
   return _tuiNullStr;
 }				/* nullStr */
@@ -387,11 +309,7 @@
    **        Accessor for the source execution info ptr.
  */
 TuiGenWinInfoPtr
-#ifdef __STDC__
 sourceExecInfoWinPtr (void)
-#else
-sourceExecInfoWinPtr ()
-#endif
 {
   return &_execInfo[0];
 }				/* sourceExecInfoWinPtr */
@@ -402,11 +320,7 @@
    **        Accessor for the disassem execution info ptr.
  */
 TuiGenWinInfoPtr
-#ifdef __STDC__
 disassemExecInfoWinPtr (void)
-#else
-disassemExecInfoWinPtr ()
-#endif
 {
   return &_execInfo[1];
 }				/* disassemExecInfoWinPtr */
@@ -418,11 +332,7 @@
    **        static locator win info struct.
  */
 TuiGenWinInfoPtr
-#ifdef __STDC__
 locatorWinInfoPtr (void)
-#else
-locatorWinInfoPtr ()
-#endif
 {
   return &_locator;
 }				/* locatorWinInfoPtr */
@@ -433,11 +343,7 @@
    **        Accessor for the history limit
  */
 int
-#ifdef __STDC__
 historyLimit (void)
-#else
-historyLimit ()
-#endif
 {
   return _historyLimit;
 }				/* historyLimit */
@@ -448,13 +354,7 @@
    **        Mutator for the history limit
  */
 void
-#ifdef __STDC__
-setHistoryLimitTo (
-		    int h)
-#else
-setHistoryLimitTo (h)
-     int h;
-#endif
+setHistoryLimitTo (int h)
 {
   _historyLimit = h;
 
@@ -466,11 +366,7 @@
    **        Accessor for the termHeight
  */
 int
-#ifdef __STDC__
 termHeight (void)
-#else
-termHeight ()
-#endif
 {
   return _termHeight;
 }				/* termHeight */
@@ -481,13 +377,7 @@
    **        Mutator for the term height
  */
 void
-#ifdef __STDC__
-setTermHeightTo (
-		  int h)
-#else
-setTermHeightTo (h)
-     int h;
-#endif
+setTermHeightTo (int h)
 {
   _termHeight = h;
 
@@ -500,11 +390,7 @@
    **        Accessor for the termWidth
  */
 int
-#ifdef __STDC__
 termWidth (void)
-#else
-termWidth ()
-#endif
 {
   return _termWidth;
 }				/* termWidth */
@@ -515,13 +401,7 @@
    **        Mutator for the termWidth
  */
 void
-#ifdef __STDC__
-setTermWidthTo (
-		 int w)
-#else
-setTermWidthTo (w)
-     int w;
-#endif
+setTermWidthTo (int w)
 {
   _termWidth = w;
 
@@ -534,11 +414,7 @@
    **        Accessor for the current layout
  */
 TuiLayoutType
-#ifdef __STDC__
 currentLayout (void)
-#else
-currentLayout ()
-#endif
 {
   return _currentLayout;
 }				/* currentLayout */
@@ -549,13 +425,7 @@
    **        Mutator for the current layout
  */
 void
-#ifdef __STDC__
-setCurrentLayoutTo (
-		     TuiLayoutType newLayout)
-#else
-setCurrentLayoutTo (newLayout)
-     TuiLayoutType newLayout;
-#endif
+setCurrentLayoutTo (TuiLayoutType newLayout)
 {
   _currentLayout = newLayout;
 
@@ -568,17 +438,7 @@
    **        Set the origin of the window
  */
 void
-#ifdef __STDC__
-setGenWinOrigin (
-		  TuiGenWinInfoPtr winInfo,
-		  int x,
-		  int y)
-#else
-setGenWinOrigin (winInfo, x, y)
-     TuiGenWinInfoPtr winInfo;
-     int x;
-     int y;
-#endif
+setGenWinOrigin (TuiGenWinInfoPtr winInfo, int x, int y)
 {
   winInfo->origin.x = x;
   winInfo->origin.y = y;
@@ -598,13 +458,7 @@
    **        if necessary
  */
 TuiWinInfoPtr
-#ifdef __STDC__
-tuiNextWin (
-	     TuiWinInfoPtr curWin)
-#else
-tuiNextWin (curWin)
-     TuiWinInfoPtr curWin;
-#endif
+tuiNextWin (TuiWinInfoPtr curWin)
 {
   TuiWinType type = curWin->generic.type;
   TuiWinInfoPtr nextWin = (TuiWinInfoPtr) NULL;
@@ -636,13 +490,7 @@
    **        if necessary
  */
 TuiWinInfoPtr
-#ifdef __STDC__
-tuiPrevWin (
-	     TuiWinInfoPtr curWin)
-#else
-tuiPrevWin (curWin)
-     TuiWinInfoPtr curWin;
-#endif
+tuiPrevWin (TuiWinInfoPtr curWin)
 {
   TuiWinType type = curWin->generic.type;
   TuiWinInfoPtr prev = (TuiWinInfoPtr) NULL;
@@ -675,15 +523,7 @@
    **        freed after use.
  */
 char *
-#ifdef __STDC__
-displayableWinContentOf (
-			  TuiGenWinInfoPtr winInfo,
-			  TuiWinElementPtr elementPtr)
-#else
-displayableWinContentOf (winInfo, elementPtr)
-     TuiGenWinInfoPtr winInfo;
-     TuiWinElementPtr elementPtr;
-#endif
+displayableWinContentOf (TuiGenWinInfoPtr winInfo, TuiWinElementPtr elementPtr)
 {
 
   char *string = nullStr ();
@@ -812,15 +652,7 @@
    **        Answer a the content at the location indicated by index
  */
 char *
-#ifdef __STDC__
-displayableWinContentAt (
-			  TuiGenWinInfoPtr winInfo,
-			  int index)
-#else
-displayableWinContentAt (winInfo, index)
-     TuiGenWinInfoPtr winInfo;
-     int index;
-#endif
+displayableWinContentAt (TuiGenWinInfoPtr winInfo, int index)
 {
   return (displayableWinContentOf (winInfo, (TuiWinElementPtr) winInfo->content[index]));
 }				/* winContentAt */
@@ -831,15 +663,7 @@
    **        Answer the height of the element in lines
  */
 int
-#ifdef __STDC__
-winElementHeight (
-		   TuiGenWinInfoPtr winInfo,
-		   TuiWinElementPtr element)
-#else
-winElementHeight (winInfo, element)
-     TuiGenWinInfoPtr winInfo;
-     TuiWinElementPtr element;
-#endif
+winElementHeight (TuiGenWinInfoPtr winInfo, TuiWinElementPtr element)
 {
   int h;
 
@@ -858,13 +682,7 @@
    **      Answer the window represented by name
  */
 TuiWinInfoPtr
-#ifdef __STDC__
-winByName (
-	    char *name)
-#else
-winByName (name)
-     char *name;
-#endif
+winByName (char *name)
 {
   TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL;
   int i = 0;
@@ -885,13 +703,7 @@
    **      Answer the window represented by name
  */
 TuiWinInfoPtr
-#ifdef __STDC__
-partialWinByName (
-		   char *name)
-#else
-partialWinByName (name)
-     char *name;
-#endif
+partialWinByName (char *name)
 {
   TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL;
 
@@ -918,13 +730,7 @@
    **      Answer the name of the window
  */
 char *
-#ifdef __STDC__
-winName (
-	  TuiGenWinInfoPtr winInfo)
-#else
-winName (winInfo)
-     TuiGenWinInfoPtr winInfo;
-#endif
+winName (TuiGenWinInfoPtr winInfo)
 {
   char *name = (char *) NULL;
 
@@ -955,11 +761,7 @@
    ** initializeStaticData
  */
 void
-#ifdef __STDC__
 initializeStaticData (void)
-#else
-initializeStaticData ()
-#endif
 {
   initGenericPart (sourceExecInfoWinPtr ());
   initGenericPart (disassemExecInfoWinPtr ());
@@ -973,11 +775,7 @@
    ** allocGenericWinInfo().
  */
 TuiGenWinInfoPtr
-#ifdef __STDC__
 allocGenericWinInfo (void)
-#else
-allocGenericWinInfo ()
-#endif
 {
   TuiGenWinInfoPtr win;
 
@@ -993,13 +791,7 @@
    ** initGenericPart().
  */
 void
-#ifdef __STDC__
-initGenericPart (
-		  TuiGenWinInfoPtr win)
-#else
-initGenericPart (win)
-     TuiGenWinInfoPtr win;
-#endif
+initGenericPart (TuiGenWinInfoPtr win)
 {
   win->width =
     win->height =
@@ -1021,15 +813,7 @@
    ** initContentElement().
  */
 void
-#ifdef __STDC__
-initContentElement (
-		     TuiWinElementPtr element,
-		     TuiWinType type)
-#else
-initContentElement (element, type)
-     TuiWinElementPtr element;
-     TuiWinType type;
-#endif
+initContentElement (TuiWinElementPtr element, TuiWinType type)
 {
   element->highlight = FALSE;
   switch (type)
@@ -1078,13 +862,7 @@
    ** initWinInfo().
  */
 void
-#ifdef __STDC__
-initWinInfo (
-	      TuiWinInfoPtr winInfo)
-#else
-initWinInfo (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+initWinInfo (TuiWinInfoPtr winInfo)
 {
   initGenericPart (&winInfo->generic);
   winInfo->canHighlight =
@@ -1125,13 +903,7 @@
    ** allocWinInfo().
  */
 TuiWinInfoPtr
-#ifdef __STDC__
-allocWinInfo (
-	       TuiWinType type)
-#else
-allocWinInfo (type)
-     TuiWinType type;
-#endif
+allocWinInfo (TuiWinType type)
 {
   TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL;
 
@@ -1151,15 +923,7 @@
    **        Allocates the content and elements in a block.
  */
 TuiWinContent
-#ifdef __STDC__
-allocContent (
-	       int numElements,
-	       TuiWinType type)
-#else
-allocContent (numElements, type)
-     int numElements;
-     TuiWinType type;
-#endif
+allocContent (int numElements, TuiWinType type)
 {
   TuiWinContent content = (TuiWinContent) NULL;
   char *elementBlockPtr = (char *) NULL;
@@ -1205,15 +969,7 @@
    **        is returned.
  */
 int
-#ifdef __STDC__
-addContentElements (
-		     TuiGenWinInfoPtr winInfo,
-		     int numElements)
-#else
-addContentElements (winInfo, numElements)
-     TuiGenWinInfoPtr winInfo;
-     int numElements;
-#endif
+addContentElements (TuiGenWinInfoPtr winInfo, int numElements)
 {
   TuiWinElementPtr elementPtr;
   int i, indexStart;
@@ -1251,13 +1007,7 @@
    **     else in tact.
  */
 void
-#ifdef __STDC__
-tuiDelWindow (
-	       TuiWinInfoPtr winInfo)
-#else
-tuiDelWindow (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiDelWindow (TuiWinInfoPtr winInfo)
 {
   Opaque detail;
   int i;
@@ -1314,13 +1064,7 @@
    **  freeWindow().
  */
 void
-#ifdef __STDC__
-freeWindow (
-	     TuiWinInfoPtr winInfo)
-#else
-freeWindow (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+freeWindow (TuiWinInfoPtr winInfo)
 {
   Opaque detail;
   int i;
@@ -1388,11 +1132,7 @@
    ** freeAllSourceWinsContent().
  */
 void
-#ifdef __STDC__
 freeAllSourceWinsContent (void)
-#else
-freeAllSourceWinsContent ()
-#endif
 {
   int i;
 
@@ -1415,13 +1155,7 @@
    ** freeWinContent().
  */
 void
-#ifdef __STDC__
-freeWinContent (
-		 TuiGenWinInfoPtr winInfo)
-#else
-freeWinContent (winInfo)
-     TuiGenWinInfoPtr winInfo;
-#endif
+freeWinContent (TuiGenWinInfoPtr winInfo)
 {
   if (winInfo->content != (OpaquePtr) NULL)
     {
@@ -1440,11 +1174,7 @@
    ** freeAllWindows().
  */
 void
-#ifdef __STDC__
 freeAllWindows (void)
-#else
-freeAllWindows ()
-#endif
 {
   TuiWinType type = SRC_WIN;
 
@@ -1457,15 +1187,7 @@
 
 
 void
-#ifdef __STDC__
-tuiDelDataWindows (
-		    TuiWinContent content,
-		    int contentSize)
-#else
-tuiDelDataWindows (content, contentSize)
-     TuiWinContent content;
-     int contentSize;
-#endif
+tuiDelDataWindows (TuiWinContent content, int contentSize)
 {
   int i;
 
@@ -1490,15 +1212,7 @@
 
 
 void
-#ifdef __STDC__
-freeDataContent (
-		  TuiWinContent content,
-		  int contentSize)
-#else
-freeDataContent (content, contentSize)
-     TuiWinContent content;
-     int contentSize;
-#endif
+freeDataContent (TuiWinContent content, int contentSize)
 {
   int i;
 
@@ -1534,17 +1248,7 @@
    ** freeContent().
  */
 static void
-#ifdef __STDC__
-freeContent (
-	      TuiWinContent content,
-	      int contentSize,
-	      TuiWinType winType)
-#else
-freeContent (content, contentSize, winType)
-     TuiWinContent content;
-     int contentSize;
-     TuiWinType winType;
-#endif
+freeContent (TuiWinContent content, int contentSize, TuiWinType winType)
 {
   if (content != (TuiWinContent) NULL)
     {
@@ -1560,17 +1264,7 @@
    ** freeContentElements().
  */
 static void
-#ifdef __STDC__
-freeContentElements (
-		      TuiWinContent content,
-		      int contentSize,
-		      TuiWinType type)
-#else
-freeContentElements (content, contentSize, type)
-     TuiWinContent content;
-     int contentSize;
-     TuiWinType type;
-#endif
+freeContentElements (TuiWinContent content, int contentSize, TuiWinType type)
 {
   if (content != (TuiWinContent) NULL)
     {
Index: tui/tuiDataWin.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiDataWin.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 tuiDataWin.c
--- tuiDataWin.c	1999/07/07 20:19:14	1.1.1.2
+++ tuiDataWin.c	2000/11/16 00:30:52
@@ -27,11 +27,7 @@
    **    If none are displayed, then return (-1).
  */
 int
-#ifdef __STDC__
 tuiFirstDataItemDisplayed (void)
-#else
-tuiFirstDataItemDisplayed ()
-#endif
 {
   int elementNo = (-1);
   int i;
@@ -56,13 +52,7 @@
    **        past the data area (-1) is returned.
  */
 int
-#ifdef __STDC__
-tuiFirstDataElementNoInLine (
-			      int lineNo)
-#else
-tuiFirstDataElementNoInLine (lineNo)
-     int lineNo;
-#endif
+tuiFirstDataElementNoInLine (int lineNo)
 {
   int firstElementNo = (-1);
 
@@ -86,11 +76,7 @@
    **        This is usually done when the data window is scrolled.
  */
 void
-#ifdef __STDC__
 tuiDeleteDataContentWindows (void)
-#else
-tuiDeleteDataContentWindows ()
-#endif
 {
   int i;
   TuiGenWinInfoPtr dataItemWinPtr;
@@ -109,13 +95,7 @@
 
 
 void
-#ifdef __STDC__
-tuiEraseDataContent (
-		      char *prompt)
-#else
-tuiEraseDataContent (prompt)
-     char *prompt;
-#endif
+tuiEraseDataContent (char *prompt)
 {
   werase (dataWin->generic.handle);
   checkAndDisplayHighlightIfNeeded (dataWin);
@@ -145,11 +125,7 @@
    **        content.  It does not set the content.
  */
 void
-#ifdef __STDC__
 tuiDisplayAllData (void)
-#else
-tuiDisplayAllData ()
-#endif
 {
   if (dataWin->generic.contentSize <= 0)
     tuiEraseDataContent (NO_DATA_STRING);
@@ -178,13 +154,7 @@
    **        data window.
  */
 void
-#ifdef __STDC__
-tuiDisplayDataFromLine (
-			 int lineNo)
-#else
-tuiDisplayDataFromLine (lineNo)
-     int lineNo;
-#endif
+tuiDisplayDataFromLine (int lineNo)
 {
   int _lineNo = lineNo;
 
@@ -232,15 +202,7 @@
    **        Display data starting at element elementNo
  */
 void
-#ifdef __STDC__
-tuiDisplayDataFrom (
-		     int elementNo,
-		     int reuseWindows)
-#else
-tuiDisplayDataFrom (elementNo, reuseWindows)
-     int elementNo;
-     int reuseWindows;
-#endif
+tuiDisplayDataFrom (int elementNo, int reuseWindows)
 {
   int firstLine = (-1);
 
@@ -267,11 +229,7 @@
    **        Function to redisplay the contents of the data window.
  */
 void
-#ifdef __STDC__
 tuiRefreshDataWin (void)
-#else
-tuiRefreshDataWin ()
-#endif
 {
   tuiEraseDataContent ((char *) NULL);
   if (dataWin->generic.contentSize > 0)
@@ -291,13 +249,7 @@
    **        Function to check the data values and hilite any that have changed
  */
 void
-#ifdef __STDC__
-tuiCheckDataValues (
-		     struct frame_info *frame)
-#else
-tuiCheckDataValues (frame)
-     struct frame_info *frame;
-#endif
+tuiCheckDataValues (struct frame_info *frame)
 {
   tuiCheckRegisterValues (frame);
 
@@ -335,13 +287,7 @@
    **        changed with args in a va_list
  */
 void
-#ifdef __STDC__
-tui_vCheckDataValues (
-		       va_list args)
-#else
-tui_vCheckDataValues (args)
-     va_list args;
-#endif
+tui_vCheckDataValues (va_list args)
 {
   struct frame_info *frame = va_arg (args, struct frame_info *);
 
@@ -356,15 +302,7 @@
    **        Scroll the data window vertically forward or backward.
  */
 void
-#ifdef __STDC__
-tuiVerticalDataScroll (
-			TuiScrollDirection scrollDirection,
-			int numToScroll)
-#else
-tuiVerticalDataScroll (scrollDirection, numToScroll)
-     TuiScrollDirection scrollDirection;
-     int numToScroll;
-#endif
+tuiVerticalDataScroll (TuiScrollDirection scrollDirection, int numToScroll)
 {
   int firstElementNo;
   int firstLine = (-1);
Index: tui/tuiDisassem.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiDisassem.c,v
retrieving revision 1.2
diff -u -r1.2 tuiDisassem.c
--- tuiDisassem.c	2000/05/28 01:12:42	1.2
+++ tuiDisassem.c	2000/11/16 00:30:52
@@ -32,15 +32,7 @@
    **        Function to set the disassembly window's content.
  */
 TuiStatus
-#ifdef __STDC__
-tuiSetDisassemContent (
-			struct symtab *s,
-			Opaque startAddr)
-#else
-tuiSetDisassemContent (s, startAddr)
-     struct symtab *s;
-     Opaque startAddr;
-#endif
+tuiSetDisassemContent (struct symtab *s, Opaque startAddr)
 {
   TuiStatus ret = TUI_FAILURE;
   struct ui_file *gdb_dis_out;
@@ -134,13 +126,7 @@
    **        Function to display the disassembly window with disassembled code.
  */
 void
-#ifdef __STDC__
-tuiShowDisassem (
-		  Opaque startAddr)
-#else
-tuiShowDisassem (startAddr)
-     Opaque startAddr;
-#endif
+tuiShowDisassem (Opaque startAddr)
 {
   struct symtab *s = find_pc_symtab ((CORE_ADDR) startAddr);
   TuiWinInfoPtr winWithFocus = tuiWinWithFocus ();
@@ -163,13 +149,7 @@
    **        Function to display the disassembly window.
  */
 void
-#ifdef __STDC__
-tuiShowDisassemAndUpdateSource (
-				 Opaque startAddr)
-#else
-tuiShowDisassemAndUpdateSource (startAddr)
-     Opaque startAddr;
-#endif
+tuiShowDisassemAndUpdateSource (Opaque startAddr)
 {
   struct symtab_and_line sal;
 
@@ -197,13 +177,7 @@
    **        the disassembly as specified by the horizontal offset.
  */
 void
-#ifdef __STDC__
-tuiShowDisassemAsIs (
-		      Opaque addr)
-#else
-tuiShowDisassemAsIs (addr)
-     Opaque addr;
-#endif
+tuiShowDisassemAsIs (Opaque addr)
 {
   tuiAddWinToLayout (DISASSEM_WIN);
   tuiUpdateSourceWindowAsIs (disassemWin, (struct symtab *) NULL, addr, FALSE);
@@ -222,11 +196,7 @@
    ** tuiGetBeginAsmAddress().
  */
 Opaque
-#ifdef __STDC__
 tuiGetBeginAsmAddress (void)
-#else
-tuiGetBeginAsmAddress ()
-#endif
 {
   TuiGenWinInfoPtr locator;
   TuiLocatorElementPtr element;
@@ -257,15 +227,7 @@
    **      Scroll the disassembly forward or backward vertically
  */
 void
-#ifdef __STDC__
-tuiVerticalDisassemScroll (
-			    TuiScrollDirection scrollDirection,
-			    int numToScroll)
-#else
-tuiVerticalDisassemScroll (scrollDirection, numToScroll)
-     TuiScrollDirection scrollDirection;
-     int numToScroll;
-#endif
+tuiVerticalDisassemScroll (TuiScrollDirection scrollDirection, int numToScroll)
 {
   if (disassemWin->generic.content != (OpaquePtr) NULL)
     {
@@ -320,13 +282,7 @@
    **      source file indicated
  */
 static struct breakpoint *
-#ifdef __STDC__
-_hasBreak (
-	    CORE_ADDR addr)
-#else
-_hasBreak (addr)
-     CORE_ADDR addr;
-#endif
+_hasBreak (CORE_ADDR addr)
 {
   struct breakpoint *bpWithBreak = (struct breakpoint *) NULL;
   struct breakpoint *bp;
Index: tui/tuiGeneralWin.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiGeneralWin.c,v
retrieving revision 1.3
diff -u -r1.3 tuiGeneralWin.c
--- tuiGeneralWin.c	2000/05/28 01:12:42	1.3
+++ tuiGeneralWin.c	2000/11/16 00:30:53
@@ -23,13 +23,7 @@
    **        Refresh the window
  */
 void
-#ifdef __STDC__
-tuiRefreshWin (
-		TuiGenWinInfoPtr winInfo)
-#else
-tuiRefreshWin (winInfo)
-     TuiGenWinInfoPtr winInfo;
-#endif
+tuiRefreshWin (TuiGenWinInfoPtr winInfo)
 {
   if (winInfo->type == DATA_WIN && winInfo->contentSize > 0)
     {
@@ -65,13 +59,7 @@
    **        Function to delete the curses window, checking for null
  */
 void
-#ifdef __STDC__
-tuiDelwin (
-	    WINDOW * window)
-#else
-tuiDelwin (window)
-     WINDOW *window;
-#endif
+tuiDelwin (WINDOW * window)
 {
   if (window != (WINDOW *) NULL)
     delwin (window);
@@ -84,15 +72,7 @@
    ** boxWin().
  */
 void
-#ifdef __STDC__
-boxWin (
-	 TuiGenWinInfoPtr winInfo,
-	 int highlightFlag)
-#else
-boxWin (winInfo, highlightFlag)
-     TuiGenWinInfoPtr winInfo;
-     int highlightFlag;
-#endif
+boxWin (TuiGenWinInfoPtr winInfo, int highlightFlag)
 {
   if (m_genWinPtrNotNull (winInfo) && winInfo->handle != (WINDOW *) NULL)
     {
@@ -114,13 +94,7 @@
    ** unhighlightWin().
  */
 void
-#ifdef __STDC__
-unhighlightWin (
-		 TuiWinInfoPtr winInfo)
-#else
-unhighlightWin (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+unhighlightWin (TuiWinInfoPtr winInfo)
 {
   if (m_winPtrNotNull (winInfo) && winInfo->generic.handle != (WINDOW *) NULL)
     {
@@ -135,13 +109,7 @@
    ** highlightWin().
  */
 void
-#ifdef __STDC__
-highlightWin (
-	       TuiWinInfoPtr winInfo)
-#else
-highlightWin (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+highlightWin (TuiWinInfoPtr winInfo)
 {
   if (m_winPtrNotNull (winInfo) &&
       winInfo->canHighlight && winInfo->generic.handle != (WINDOW *) NULL)
@@ -157,13 +125,7 @@
    ** checkAndDisplayHighlightIfNecessay
  */
 void
-#ifdef __STDC__
-checkAndDisplayHighlightIfNeeded (
-				   TuiWinInfoPtr winInfo)
-#else
-checkAndDisplayHighlightIfNeeded (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+checkAndDisplayHighlightIfNeeded (TuiWinInfoPtr winInfo)
 {
   if (m_winPtrNotNull (winInfo) && winInfo->generic.type != CMD_WIN)
     {
@@ -181,15 +143,7 @@
    ** makeWindow().
  */
 void
-#ifdef __STDC__
-makeWindow (
-	     TuiGenWinInfoPtr winInfo,
-	     int boxIt)
-#else
-makeWindow (winInfo, boxIt)
-     TuiGenWinInfoPtr winInfo;
-     int boxIt;
-#endif
+makeWindow (TuiGenWinInfoPtr winInfo, int boxIt)
 {
   WINDOW *handle;
 
@@ -226,13 +180,7 @@
    **        Clear the window of all contents without calling wclear.
  */
 void
-#ifdef __STDC__
-tuiClearWin (
-	      TuiGenWinInfoPtr winInfo)
-#else
-tuiClearWin (winInfo)
-     TuiGenWinInfoPtr winInfo;
-#endif
+tuiClearWin (TuiGenWinInfoPtr winInfo)
 {
   if (m_genWinPtrNotNull (winInfo) && winInfo->handle != (WINDOW *) NULL)
     {
@@ -256,15 +204,7 @@
    **        and create it again when making it visible.
  */
 void
-#ifdef __STDC__
-makeVisible (
-	      TuiGenWinInfoPtr winInfo,
-	      int visible)
-#else
-makeVisible (winInfo, visible)
-     TuiGenWinInfoPtr winInfo;
-     int visible;
-#endif
+makeVisible (TuiGenWinInfoPtr winInfo, int visible)
 {
   /* Don't tear down/recreate command window */
   if (winInfo->type == CMD_WIN)
@@ -299,13 +239,7 @@
    **        Makes all windows invisible (except the command and locator windows)
  */
 void
-#ifdef __STDC__
-makeAllVisible (
-		 int visible)
-#else
-makeAllVisible (visible)
-     int visible;
-#endif
+makeAllVisible (int visible)
 {
   int i;
 
@@ -329,15 +263,7 @@
    ** scrollWinForward
  */
 void
-#ifdef __STDC__
-scrollWinForward (
-		   TuiGenWinInfoPtr winInfo,
-		   int numLines)
-#else
-scrollWinForward (winInfo, numLines)
-     TuiGenWinInfoPtr winInfo;
-     int numLines;
-#endif
+scrollWinForward (TuiGenWinInfoPtr winInfo, int numLines)
 {
   if (winInfo->content != (OpaquePtr) NULL &&
       winInfo->lastVisibleLine < winInfo->contentSize - 1)
@@ -379,15 +305,7 @@
    ** scrollWinBackward
  */
 void
-#ifdef __STDC__
-scrollWinBackward (
-		    TuiGenWinInfoPtr winInfo,
-		    int numLines)
-#else
-scrollWinBackward (winInfo, numLines)
-     TuiGenWinInfoPtr winInfo;
-     int numLines;
-#endif
+scrollWinBackward (TuiGenWinInfoPtr winInfo, int numLines)
 {
   if (winInfo->content != (OpaquePtr) NULL &&
       (winInfo->lastVisibleLine - winInfo->viewportHeight) > 0)
@@ -429,13 +347,7 @@
    **        Function to refresh all the windows currently displayed
  */
 void
-#ifdef __STDC__
-refreshAll (
-	     TuiWinInfoPtr * list)
-#else
-refreshAll (list)
-     TuiWinInfoPtr *list;
-#endif
+refreshAll (TuiWinInfoPtr * list)
 {
   TuiWinType type;
   TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
Index: tui/tuiIO.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiIO.c,v
retrieving revision 1.4
diff -u -r1.4 tuiIO.c
--- tuiIO.c	2000/06/18 00:23:24	1.4
+++ tuiIO.c	2000/11/16 00:30:54
@@ -47,15 +47,7 @@
    **              mode), calls tuiPuts_unfiltered().
  */
 void
-#ifdef __STDC__
-tuiPuts_unfiltered (
-		     const char *string,
-		     struct ui_file * stream)
-#else
-tuiPuts_unfiltered (string, stream)
-     char *string;
-     struct ui_file *stream;
-#endif
+tuiPuts_unfiltered (const char *string, struct ui_file *stream)
 {
   int len = strlen (string);
   int i, linech;
@@ -262,12 +254,7 @@
    **        Wrapper around wgetch with the window in a va_list
  */
 unsigned int
-#ifdef __STDC__
 tui_vwgetch (va_list args)
-#else
-tui_vwgetch (args)
-     va_list args;
-#endif
 {
   unsigned int ch;
   WINDOW *window;
@@ -283,12 +270,7 @@
    **   Wrapper around read() with paramets in a va_list
  */
 unsigned int
-#ifdef __STDC__
 tui_vread (va_list args)
-#else
-tui_vread (args)
-     va_list args;
-#endif
 {
   int result = 0;
   int filedes = va_arg (args, int);
@@ -305,17 +287,7 @@
    **    Function to perform a read() catching resize events
  */
 int
-#ifdef __STDC__
-tuiRead (
-	  int filedes,
-	  char *buf,
-	  int nbytes)
-#else
-tuiRead (filedes, buf, nbytes)
-     int filedes;
-     char *buf;
-     int nbytes;
-#endif
+tuiRead (int filedes, char *buf, int nbytes)
 {
   int result = 0;
 
@@ -336,11 +308,7 @@
    **                command_line_input() in top.c
  */
 unsigned int
-#ifdef __STDC__
 tuiGetc (void)
-#else
-tuiGetc ()
-#endif
 {
   unsigned int ch;
   extern char *rl_prompt;
@@ -384,11 +352,7 @@
    utils.c */
 
 unsigned int
-#ifdef __STDC__
 tuiBufferGetc (void)
-#else
-tuiBufferGetc ()
-#endif
 {
   unsigned int ch;
   static unsigned char _ibuffer[512];
@@ -437,13 +401,7 @@
    ** tuiStartNewLines().
  */
 void
-#ifdef __STDC__
-tuiStartNewLines (
-		   int numLines)
-#else
-tuiStartNewLines (numLines)
-     int numLines;
-#endif
+tuiStartNewLines (int numLines)
 {
   if (numLines > 0)
     {
@@ -468,13 +426,7 @@
    **        With numLines in a va_list
  */
 void
-#ifdef __STDC__
-tui_vStartNewLines (
-		     va_list args)
-#else
-tui_vStartNewLines (args)
-     va_list args;
-#endif
+tui_vStartNewLines (va_list args)
 {
   int numLines = va_arg (args, int);
 
@@ -496,13 +448,7 @@
    **    to return from getc or read.
  */
 static unsigned int
-#ifdef __STDC__
-_tuiHandleResizeDuringIO (
-			   unsigned int originalCh)	/* the char just read */
-#else
-_tuiHandleResizeDuringIO (originalCh)
-     unsigned int originalCh;
-#endif
+_tuiHandleResizeDuringIO (unsigned int originalCh)	/* the char just read */
 {
   if (tuiWinResized ())
     {
@@ -522,13 +468,7 @@
    **        Function to update the command window information.
  */
 static void
-#ifdef __STDC__
-_updateCommandInfo (
-		     int sizeOfString)
-#else
-_updateCommandInfo (sizeOfString)
-     int sizeOfString;
-#endif
+_updateCommandInfo (int sizeOfString)
 {
 
   if ((sizeOfString +
@@ -558,13 +498,7 @@
  */
 
 void
-#ifdef __STDC__
-tuiTermSetup (
-	       int turn_off_echo)
-#else
-tuiTermSetup (turn_off_echo)
-     int turn_off_echo;
-#endif
+tuiTermSetup (int turn_off_echo)
 {
   char *buffer;
   int start;
@@ -653,15 +587,7 @@
  * way out of tuiDo, thus setting up the terminal this way for
  * debugger command I/O.  */
 void
-#ifdef __STDC__
-tuiTermUnsetup (
-		 int turn_on_echo,
-		 int to_column)
-#else
-tuiTermUnsetup (turn_on_echo, to_column)
-     int turn_on_echo;
-     int to_column;
-#endif
+tuiTermUnsetup (int turn_on_echo, int to_column)
 {
   int start;
   int end;
Index: tui/tuiLayout.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiLayout.c,v
retrieving revision 1.4
diff -u -r1.4 tuiLayout.c
--- tuiLayout.c	2000/07/30 01:48:28	1.4
+++ tuiLayout.c	2000/11/16 00:30:55
@@ -64,13 +64,7 @@
    **        Show the screen layout defined
  */
 void
-#ifdef __STDC__
-showLayout (
-	     TuiLayoutType layout)
-#else
-showLayout (layout)
-     TuiLayoutType layout;
-#endif
+showLayout (TuiLayoutType layout)
 {
   TuiLayoutType curLayout = currentLayout ();
 
@@ -130,15 +124,7 @@
    **    to regsDisplayType.
  */
 TuiStatus
-#ifdef __STDC__
-tuiSetLayout (
-	       TuiLayoutType layoutType,
-	       TuiRegisterDisplayType regsDisplayType)
-#else
-tuiSetLayout (layoutType, regsDisplayType)
-     TuiLayoutType layoutType;
-     TuiRegisterDisplayType regsDisplayType;
-#endif
+tuiSetLayout (TuiLayoutType layoutType, TuiRegisterDisplayType regsDisplayType)
 {
   TuiStatus status = TUI_SUCCESS;
 
@@ -280,13 +266,7 @@
    **        REGS, $REGS, $GREGS, $FREGS, $SREGS with arguments in a va_list
  */
 TuiStatus
-#ifdef __STDC__
-tui_vSetLayoutTo (
-		   va_list args)
-#else
-tui_vSetLayoutTo (args)
-     va_list args;
-#endif
+tui_vSetLayoutTo (va_list args)
 {
   char *layoutName;
 
@@ -303,13 +283,7 @@
    **        window to be added.
  */
 void
-#ifdef __STDC__
-tuiAddWinToLayout (
-		    TuiWinType type)
-#else
-tuiAddWinToLayout (type)
-     TuiWinType type;
-#endif
+tuiAddWinToLayout (TuiWinType type)
 {
   TuiLayoutType curLayout = currentLayout ();
 
@@ -363,13 +337,7 @@
    **        with arguments in a va_list.
  */
 void
-#ifdef __STDC__
-tui_vAddWinToLayout (
-		      va_list args)
-#else
-tui_vAddWinToLayout (args)
-     va_list args;
-#endif
+tui_vAddWinToLayout (va_list args)
 {
   TuiWinType type = va_arg (args, TuiWinType);
 
@@ -386,15 +354,7 @@
    **        type and the layout.
  */
 int
-#ifdef __STDC__
-tuiDefaultWinHeight (
-		      TuiWinType type,
-		      TuiLayoutType layout)
-#else
-tuiDefaultWinHeight (type, layout)
-     TuiWinType type;
-     TuiLayoutType layout;
-#endif
+tuiDefaultWinHeight (TuiWinType type, TuiLayoutType layout)
 {
   int h;
 
@@ -436,15 +396,7 @@
    **        type and the layout.
  */
 int
-#ifdef __STDC__
-tuiDefaultWinViewportHeight (
-			      TuiWinType type,
-			      TuiLayoutType layout)
-#else
-tuiDefaultWinViewportHeight (type, layout)
-     TuiWinType type;
-     TuiLayoutType layout;
-#endif
+tuiDefaultWinViewportHeight (TuiWinType type, TuiLayoutType layout)
 {
   int h;
 
@@ -507,13 +459,7 @@
    **        $REGS, $GREGS, $FREGS, $SREGS.
  */
 static TuiStatus
-#ifdef __STDC__
-_tuiSetLayoutTo (
-		  char *layoutName)
-#else
-_tuiSetLayoutTo (layoutName)
-     char *layoutName;
-#endif
+_tuiSetLayoutTo (char *layoutName)
 {
   TuiStatus status = TUI_SUCCESS;
 
@@ -616,11 +562,7 @@
 
 
 static Opaque
-#ifdef __STDC__
 _extractDisplayStartAddr (void)
-#else
-_extractDisplayStartAddr ()
-#endif
 {
   TuiLayoutType curLayout = currentLayout ();
   Opaque addr;
@@ -648,13 +590,7 @@
 
 
 static void
-#ifdef __STDC__
-_tuiHandleXDBLayout (
-		      TuiLayoutDefPtr layoutDef)
-#else
-_tuiHandleXDBLayout (layoutDef)
-     TuiLayoutDefPtr layoutDef;
-#endif
+_tuiHandleXDBLayout (TuiLayoutDefPtr layoutDef)
 {
   if (layoutDef->split)
     {
@@ -675,27 +611,13 @@
 
 
 static void
-#ifdef __STDC__
-_tuiToggleLayout_command (
-			   char *arg,
-			   int fromTTY)
-#else
-_tuiToggleLayout_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiToggleLayout_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) _tui_vToggleLayout_command, arg, fromTTY);
 }
 
 static void
-#ifdef __STDC__
-_tui_vToggleLayout_command (
-			     va_list args)
-#else
-_tui_vToggleLayout_command (args)
-     va_list args;
-#endif
+_tui_vToggleLayout_command (va_list args)
 {
   TuiLayoutDefPtr layoutDef = tuiLayoutDef ();
 
@@ -712,27 +634,13 @@
 
 
 static void
-#ifdef __STDC__
-_tuiToggleSplitLayout_command (
-				char *arg,
-				int fromTTY)
-#else
-_tuiToggleSplitLayout_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiToggleSplitLayout_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) _tui_vToggleSplitLayout_command, arg, fromTTY);
 }
 
 static void
-#ifdef __STDC__
-_tui_vToggleSplitLayout_command (
-				  va_list args)
-#else
-_tui_vToggleSplitLayout_command (args)
-     va_list args;
-#endif
+_tui_vToggleSplitLayout_command (va_list args)
 {
   TuiLayoutDefPtr layoutDef = tuiLayoutDef ();
 
@@ -744,15 +652,7 @@
 
 
 static void
-#ifdef __STDC__
-_tuiLayout_command (
-		     char *arg,
-		     int fromTTY)
-#else
-_tuiLayout_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiLayout_command (char *arg, int fromTTY)
 {
   if ((TuiStatus) tuiDo (
 		   (TuiOpaqueFuncPtr) tui_vSetLayoutTo, arg) != TUI_SUCCESS)
@@ -766,11 +666,7 @@
    **        Answer the previous layout to cycle to.
  */
 static TuiLayoutType
-#ifdef __STDC__
 _nextLayout (void)
-#else
-_nextLayout ()
-#endif
 {
   TuiLayoutType newLayout;
 
@@ -793,11 +689,7 @@
    **        Answer the next layout to cycle to.
  */
 static TuiLayoutType
-#ifdef __STDC__
 _prevLayout (void)
-#else
-_prevLayout ()
-#endif
 {
   TuiLayoutType newLayout;
 
@@ -820,17 +712,7 @@
    ** _makeCommandWindow().
  */
 static void
-#ifdef __STDC__
-_makeCommandWindow (
-		     TuiWinInfoPtr * winInfoPtr,
-		     int height,
-		     int originY)
-#else
-_makeCommandWindow (winInfoPtr, height, originY)
-     TuiWinInfoPtr *winInfoPtr;
-     int height;
-     int originY;
-#endif
+_makeCommandWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY)
 {
   _initAndMakeWin ((Opaque *) winInfoPtr,
 		   CMD_WIN,
@@ -850,17 +732,7 @@
    ** _makeSourceWindow().
  */
 static void
-#ifdef __STDC__
-_makeSourceWindow (
-		    TuiWinInfoPtr * winInfoPtr,
-		    int height,
-		    int originY)
-#else
-_makeSourceWindow (winInfoPtr, height, originY)
-     TuiWinInfoPtr *winInfoPtr;
-     int height;
-     int originY;
-#endif
+_makeSourceWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY)
 {
   _makeSourceOrDisassemWindow (winInfoPtr, SRC_WIN, height, originY);
 
@@ -872,17 +744,7 @@
    ** _makeDisassemWindow().
  */
 static void
-#ifdef __STDC__
-_makeDisassemWindow (
-		      TuiWinInfoPtr * winInfoPtr,
-		      int height,
-		      int originY)
-#else
-_makeDisassemWindow (winInfoPtr, height, originY)
-     TuiWinInfoPtr *winInfoPtr;
-     int height;
-     int originY;
-#endif
+_makeDisassemWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY)
 {
   _makeSourceOrDisassemWindow (winInfoPtr, DISASSEM_WIN, height, originY);
 
@@ -894,17 +756,7 @@
    ** _makeDataWindow().
  */
 static void
-#ifdef __STDC__
-_makeDataWindow (
-		  TuiWinInfoPtr * winInfoPtr,
-		  int height,
-		  int originY)
-#else
-_makeDataWindow (winInfoPtr, height, originY)
-     TuiWinInfoPtr *winInfoPtr;
-     int height;
-     int originY;
-#endif
+_makeDataWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY)
 {
   _initAndMakeWin ((Opaque *) winInfoPtr,
 		   DATA_WIN,
@@ -924,11 +776,7 @@
    **        Show the Source/Command layout
  */
 static void
-#ifdef __STDC__
 _showSourceCommand (void)
-#else
-_showSourceCommand ()
-#endif
 {
   _showSourceOrDisassemAndCommand (SRC_COMMAND);
 
@@ -941,11 +789,7 @@
    **        Show the Dissassem/Command layout
  */
 static void
-#ifdef __STDC__
 _showDisassemCommand (void)
-#else
-_showDisassemCommand ()
-#endif
 {
   _showSourceOrDisassemAndCommand (DISASSEM_COMMAND);
 
@@ -958,11 +802,7 @@
    **        Show the Source/Disassem/Command layout
  */
 static void
-#ifdef __STDC__
 _showSourceDisassemCommand (void)
-#else
-_showSourceDisassemCommand ()
-#endif
 {
   TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
 
@@ -1080,13 +920,7 @@
    **        Show the Source/Data/Command or the Dissassembly/Data/Command layout
  */
 static void
-#ifdef __STDC__
-_showData (
-	    TuiLayoutType newLayout)
-#else
-_showData (newLayout)
-     TuiLayoutType newLayout;
-#endif
+_showData (TuiLayoutType newLayout)
 {
   int totalHeight = (termHeight () - cmdWin->generic.height);
   int srcHeight, dataHeight;
@@ -1154,23 +988,9 @@
    ** _initGenWinInfo().
  */
 static void
-#ifdef __STDC__
-_initGenWinInfo (
-		  TuiGenWinInfoPtr winInfo,
-		  TuiWinType type,
-		  int height,
-		  int width,
-		  int originX,
-		  int originY)
-#else
-_initGenWinInfo (winInfo, type, height, width, originX, originY)
-     TuiGenWinInfoPtr winInfo;
-     TuiWinType type;
-     int height;
-     int width;
-     int originX;
-     int originY;
-#endif
+_initGenWinInfo (TuiGenWinInfoPtr winInfo,
+		 TuiWinType type,
+		 int height, int width, int originX, int originY)
 {
   int h = height;
 
@@ -1195,25 +1015,9 @@
    ** _initAndMakeWin().
  */
 static void
-#ifdef __STDC__
-_initAndMakeWin (
-		  Opaque * winInfoPtr,
-		  TuiWinType winType,
-		  int height,
-		  int width,
-		  int originX,
-		  int originY,
-		  int boxIt)
-#else
-_initAndMakeWin (winInfoPtr, winType, height, width, originX, originY, boxIt)
-     Opaque *winInfoPtr;
-     TuiWinType winType;
-     int height;
-     int width;
-     int originX;
-     int originY;
-     int boxIt;
-#endif
+_initAndMakeWin (Opaque * winInfoPtr,
+		 TuiWinType winType,
+		 int height, int width, int originX, int originY, int boxIt)
 {
   Opaque opaqueWinInfo = *winInfoPtr;
   TuiGenWinInfoPtr generic;
@@ -1255,19 +1059,8 @@
    ** _makeSourceOrDisassemWindow().
  */
 static void
-#ifdef __STDC__
-_makeSourceOrDisassemWindow (
-			      TuiWinInfoPtr * winInfoPtr,
-			      TuiWinType type,
-			      int height,
-			      int originY)
-#else
-_makeSourceOrDisassemWindow (winInfoPtr, type, height, originY)
-     TuiWinInfoPtr *winInfoPtr;
-     TuiWinType type;
-     int height;
-     int originY;
-#endif
+_makeSourceOrDisassemWindow (TuiWinInfoPtr * winInfoPtr,
+			     TuiWinType type, int height, int originY)
 {
   TuiGenWinInfoPtr executionInfo = (TuiGenWinInfoPtr) NULL;
 
@@ -1307,13 +1100,7 @@
    **        Show the Source/Command or the Disassem layout
  */
 static void
-#ifdef __STDC__
-_showSourceOrDisassemAndCommand (
-				  TuiLayoutType layoutType)
-#else
-_showSourceOrDisassemAndCommand (layoutType)
-     TuiLayoutType layoutType;
-#endif
+_showSourceOrDisassemAndCommand (TuiLayoutType layoutType)
 {
   if (currentLayout () != layoutType)
     {
Index: tui/tuiRegs.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiRegs.c,v
retrieving revision 1.3
diff -u -r1.3 tuiRegs.c
--- tuiRegs.c	2000/07/30 01:48:28	1.3
+++ tuiRegs.c	2000/11/16 00:30:56
@@ -85,11 +85,7 @@
    **        If there are no registers (-1) is returned.
  */
 int
-#ifdef __STDC__
 tuiLastRegsLineNo (void)
-#else
-tuiLastRegsLineNo ()
-#endif
 {
   register int numLines = (-1);
 
@@ -112,13 +108,7 @@
    **        there are, -1 is returned.
  */
 int
-#ifdef __STDC__
-tuiLineFromRegElementNo (
-			  int elementNo)
-#else
-tuiLineFromRegElementNo (elementNo)
-     int elementNo;
-#endif
+tuiLineFromRegElementNo (int elementNo)
 {
   if (elementNo < dataWin->detail.dataDisplayInfo.regsContentCount)
     {
@@ -147,13 +137,7 @@
    **        past the register area (-1) is returned.
  */
 int
-#ifdef __STDC__
-tuiFirstRegElementNoInLine (
-			     int lineNo)
-#else
-tuiFirstRegElementNoInLine (lineNo)
-     int lineNo;
-#endif
+tuiFirstRegElementNoInLine (int lineNo)
 {
   if ((lineNo * dataWin->detail.dataDisplayInfo.regsColumnCount)
       <= dataWin->detail.dataDisplayInfo.regsContentCount)
@@ -171,13 +155,7 @@
    **        the register area (-1) is returned.
  */
 int
-#ifdef __STDC__
-tuiLastRegElementNoInLine (
-			    int lineNo)
-#else
-tuiLastRegElementNoInLine (lineNo)
-     int lineNo;
-#endif
+tuiLastRegElementNoInLine (int lineNo)
 {
   if ((lineNo * dataWin->detail.dataDisplayInfo.regsColumnCount) <=
       dataWin->detail.dataDisplayInfo.regsContentCount)
@@ -194,13 +172,7 @@
    **        the registers.
  */
 int
-#ifdef __STDC__
-tuiCalculateRegsColumnCount (
-			      TuiRegisterDisplayType dpyType)
-#else
-tuiCalculateRegsColumnCount (dpyType)
-     TuiRegisterDisplayType dpyType;
-#endif
+tuiCalculateRegsColumnCount (TuiRegisterDisplayType dpyType)
 {
   int colCount, colWidth;
 
@@ -226,13 +198,7 @@
    **        cleared.  What registers are displayed is dependent upon dpyType.
  */
 void
-#ifdef __STDC__
-tuiShowRegisters (
-		   TuiRegisterDisplayType dpyType)
-#else
-tuiShowRegisters (dpyType)
-     TuiRegisterDisplayType dpyType;
-#endif
+tuiShowRegisters (TuiRegisterDisplayType dpyType)
 {
   TuiStatus ret = TUI_FAILURE;
   int refreshValuesOnly = FALSE;
@@ -305,13 +271,7 @@
    **        the end of the registers is done here.
  */
 void
-#ifdef __STDC__
-tuiDisplayRegistersFrom (
-			  int startElementNo)
-#else
-tuiDisplayRegistersFrom (startElementNo)
-     int startElementNo;
-#endif
+tuiDisplayRegistersFrom (int startElementNo)
 {
   if (dataWin->detail.dataDisplayInfo.regsContent != (TuiWinContent) NULL &&
       dataWin->detail.dataDisplayInfo.regsContentCount > 0)
@@ -397,15 +357,7 @@
    **        of the register display.
  */
 void
-#ifdef __STDC__
-tuiDisplayRegElementAtLine (
-			     int startElementNo,
-			     int startLineNo)
-#else
-tuiDisplayRegElementAtLine (startElementNo, startLineNo)
-     int startElementNo;
-     int startLineNo;
-#endif
+tuiDisplayRegElementAtLine (int startElementNo, int startLineNo)
 {
   if (dataWin->detail.dataDisplayInfo.regsContent != (TuiWinContent) NULL &&
       dataWin->detail.dataDisplayInfo.regsContentCount > 0)
@@ -444,15 +396,7 @@
    **        actually started from.  If nothing is displayed (-1) is returned.
  */
 int
-#ifdef __STDC__
-tuiDisplayRegistersFromLine (
-			      int lineNo,
-			      int forceDisplay)
-#else
-tuiDisplayRegistersFromLine (lineNo, forceDisplay)
-     int lineNo;
-     int forceDisplay;
-#endif
+tuiDisplayRegistersFromLine (int lineNo, int forceDisplay)
 {
   int elementNo;
 
@@ -499,13 +443,7 @@
    **        they are updated with the new value and highlighted.
  */
 void
-#ifdef __STDC__
-tuiCheckRegisterValues (
-			 struct frame_info *frame)
-#else
-tuiCheckRegisterValues (frame)
-     struct frame_info *frame;
-#endif
+tuiCheckRegisterValues (struct frame_info *frame)
 {
   if (m_winPtrNotNull (dataWin) && dataWin->generic.isVisible)
     {
@@ -563,11 +501,7 @@
    ** tuiToggleFloatRegs().
  */
 void
-#ifdef __STDC__
 tuiToggleFloatRegs (void)
-#else
-tuiToggleFloatRegs ()
-#endif
 {
   TuiLayoutDefPtr layoutDef = tuiLayoutDef ();
 
@@ -624,13 +558,7 @@
    **        Return the register name.
  */
 static char *
-#ifdef __STDC__
-_tuiRegisterName (
-		   int regNum)
-#else
-_tuiRegisterName (regNum)
-     int regNum;
-#endif
+_tuiRegisterName (int regNum)
 {
   if (reg_names[regNum] != (char *) NULL && *(reg_names[regNum]) != (char) 0)
     return reg_names[regNum];
@@ -645,21 +573,11 @@
    **        suitable for printing or display
  */
 static void
-#ifdef __STDC__
-_tuiRegisterFormat (
-		     char *buf,
-		     int bufLen,
-		     int regNum,
-		     TuiDataElementPtr dataElement,
-		     enum precision_type precision)
-#else
-_tuiRegisterFormat (buf, bufLen, regNum, dataElement, precision)
-     char *buf;
-     int bufLen;
-     int regNum;
-     TuiDataElementPtr dataElement;
-     enum precision_type precision;
-#endif
+_tuiRegisterFormat (char *buf,
+		    int bufLen,
+		    int regNum,
+		    TuiDataElementPtr dataElement,
+		    enum precision_type precision)
 {
   char tmpBuf[15];
   char *fmt;
@@ -680,13 +598,7 @@
    **      Set the content of the data window to consist of the general registers.
  */
 static TuiStatus
-#ifdef __STDC__
-_tuiSetGeneralRegsContent (
-			    int refreshValuesOnly)
-#else
-_tuiSetGeneralRegsContent (refreshValuesOnly)
-     int refreshValuesOnly;
-#endif
+_tuiSetGeneralRegsContent (int refreshValuesOnly)
 {
   return (_tuiSetRegsContent (0,
 			      NUM_GENERAL_REGS - 1,
@@ -703,13 +615,7 @@
    **      Set the content of the data window to consist of the special registers.
  */
 static TuiStatus
-#ifdef __STDC__
-_tuiSetSpecialRegsContent (
-			    int refreshValuesOnly)
-#else
-_tuiSetSpecialRegsContent (refreshValuesOnly)
-     int refreshValuesOnly;
-#endif
+_tuiSetSpecialRegsContent (int refreshValuesOnly)
 {
   TuiStatus ret = TUI_FAILURE;
   int i, endRegNum;
@@ -736,13 +642,7 @@
    **      Set the content of the data window to consist of the special registers.
  */
 static TuiStatus
-#ifdef __STDC__
-_tuiSetGeneralAndSpecialRegsContent (
-				      int refreshValuesOnly)
-#else
-_tuiSetGeneralAndSpecialRegsContent (refreshValuesOnly)
-     int refreshValuesOnly;
-#endif
+_tuiSetGeneralAndSpecialRegsContent (int refreshValuesOnly)
 {
   TuiStatus ret = TUI_FAILURE;
   int i, endRegNum = (-1);
@@ -765,15 +665,7 @@
    **        Set the content of the data window to consist of the float registers.
  */
 static TuiStatus
-#ifdef __STDC__
-_tuiSetFloatRegsContent (
-			  TuiRegisterDisplayType dpyType,
-			  int refreshValuesOnly)
-#else
-_tuiSetFloatRegsContent (dpyType, refreshValuesOnly)
-     TuiRegisterDisplayType dpyType;
-     int refreshValuesOnly;
-#endif
+_tuiSetFloatRegsContent (TuiRegisterDisplayType dpyType, int refreshValuesOnly)
 {
   TuiStatus ret = TUI_FAILURE;
   int i, startRegNum;
@@ -801,17 +693,8 @@
    **        If TRUE, newValue is filled in with the new value.
  */
 static int
-#ifdef __STDC__
-_tuiRegValueHasChanged (
-			 TuiDataElementPtr dataElement,
-			 struct frame_info *frame,
-			 char *newValue)
-#else
-_tuiRegValueHasChanged (dataElement, frame, newValue)
-     TuiDataElementPtr dataElement;
-     struct frame_info *frame;
-     char *newValue;
-#endif
+_tuiRegValueHasChanged (TuiDataElementPtr dataElement,
+			struct frame_info *frame, char *newValue)
 {
   int hasChanged = FALSE;
 
@@ -843,17 +726,7 @@
    **        Get the register raw value.  The raw value is returned in regValue.
  */
 static TuiStatus
-#ifdef __STDC__
-_tuiGetRegisterRawValue (
-			  int regNum,
-			  char *regValue,
-			  struct frame_info *frame)
-#else
-_tuiGetRegisterRawValue (regNum, regValue, frame)
-     int regNum;
-     char *regValue;
-     struct frame_info *frame;
-#endif
+_tuiGetRegisterRawValue (int regNum, char *regValue, struct frame_info *frame)
 {
   TuiStatus ret = TUI_FAILURE;
 
@@ -874,19 +747,9 @@
    **       the register value.
  */
 static void
-#ifdef __STDC__
-_tuiSetRegisterElement (
-			 int regNum,
-			 struct frame_info *frame,
-			 TuiDataElementPtr dataElement,
-			 int refreshValueOnly)
-#else
-_tuiSetRegisterElement (regNum, frame, dataElement, refreshValueOnly)
-     int regNum;
-     struct frame_info *frame;
-     TuiDataElementPtr dataElement;
-     int refreshValueOnly;
-#endif
+_tuiSetRegisterElement (int regNum,
+			struct frame_info *frame,
+			TuiDataElementPtr dataElement, int refreshValueOnly)
 {
   if (dataElement != (TuiDataElementPtr) NULL)
     {
@@ -913,21 +776,10 @@
    **        refreshValuesOnly is TRUE, startRegNum and endRegNum are ignored.
  */
 static TuiStatus
-#ifdef __STDC__
-_tuiSetRegsContent (
-		     int startRegNum,
-		     int endRegNum,
-		     struct frame_info *frame,
-		     TuiRegisterDisplayType dpyType,
-		     int refreshValuesOnly)
-#else
-_tuiSetRegsContent (startRegNum, endRegNum, frame, dpyType, refreshValuesOnly)
-     int startRegNum;
-     int endRegNum;
-     struct frame_info *frame;
-     TuiRegisterDisplayType dpyType;
-     int refreshValuesOnly;
-#endif
+_tuiSetRegsContent (int startRegNum,
+		    int endRegNum,
+		    struct frame_info *frame,
+		    TuiRegisterDisplayType dpyType, int refreshValuesOnly)
 {
   TuiStatus ret = TUI_FAILURE;
   int numRegs = endRegNum - startRegNum + 1;
@@ -1001,17 +853,8 @@
    **        than the value will be displayed in reverse video
  */
 static void
-#ifdef __STDC__
-_tuiDisplayRegister (
-		      int regNum,
-		      TuiGenWinInfoPtr winInfo,		/* the data item window */
-		      enum precision_type precision)
-#else
-_tuiDisplayRegister (regNum, winInfo, precision)
-     int regNum;
-     TuiGenWinInfoPtr winInfo;	/* the data item window */
-     enum precision_type precision;
-#endif
+_tuiDisplayRegister (int regNum, TuiGenWinInfoPtr winInfo,	/* the data item window */
+		     enum precision_type precision)
 {
   if (winInfo->handle != (WINDOW *) NULL)
     {
@@ -1063,13 +906,7 @@
 
 
 static void
-#ifdef __STDC__
-_tui_vShowRegisters_commandSupport (
-				     va_list args)
-#else
-_tui_vShowRegisters_commandSupport (args)
-     va_list args;
-#endif
+_tui_vShowRegisters_commandSupport (va_list args)
 {
   TuiRegisterDisplayType dpyType = va_arg (args, TuiRegisterDisplayType);
 
@@ -1086,15 +923,7 @@
 
 
 static void
-#ifdef __STDC__
-_tuiShowFloat_command (
-			char *arg,
-			int fromTTY)
-#else
-_tuiShowFloat_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiShowFloat_command (char *arg, int fromTTY)
 {
   if (m_winPtrIsNull (dataWin) || !dataWin->generic.isVisible ||
       (dataWin->detail.dataDisplayInfo.regsDisplayType != TUI_SFLOAT_REGS &&
@@ -1107,15 +936,7 @@
 
 
 static void
-#ifdef __STDC__
-_tuiShowGeneral_command (
-			  char *arg,
-			  int fromTTY)
-#else
-_tuiShowGeneral_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiShowGeneral_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) _tui_vShowRegisters_commandSupport,
 	 TUI_GENERAL_REGS);
@@ -1125,15 +946,7 @@
 
 
 static void
-#ifdef __STDC__
-_tuiShowSpecial_command (
-			  char *arg,
-			  int fromTTY)
-#else
-_tuiShowSpecial_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiShowSpecial_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) _tui_vShowRegisters_commandSupport,
 	 TUI_SPECIAL_REGS);
@@ -1143,15 +956,7 @@
 
 
 static void
-#ifdef __STDC__
-_tuiToggleFloatRegs_command (
-			      char *arg,
-			      int fromTTY)
-#else
-_tuiToggleFloatRegs_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiToggleFloatRegs_command (char *arg, int fromTTY)
 {
   if (m_winPtrNotNull (dataWin) && dataWin->generic.isVisible)
     tuiDo ((TuiOpaqueFuncPtr) tuiToggleFloatRegs);
@@ -1171,15 +976,7 @@
 
 
 static void
-#ifdef __STDC__
-_tuiScrollRegsForward_command (
-				char *arg,
-				int fromTTY)
-#else
-_tuiScrollRegsForward_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiScrollRegsForward_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) tui_vScroll, FORWARD_SCROLL, dataWin, 1);
 
@@ -1188,15 +985,7 @@
 
 
 static void
-#ifdef __STDC__
-_tuiScrollRegsBackward_command (
-				 char *arg,
-				 int fromTTY)
-#else
-_tuiScrollRegsBackward_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiScrollRegsBackward_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) tui_vScroll, BACKWARD_SCROLL, dataWin, 1);
 
Index: tui/tuiSource.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiSource.c,v
retrieving revision 1.2
diff -u -r1.2 tuiSource.c
--- tuiSource.c	2000/05/28 01:12:42	1.2
+++ tuiSource.c	2000/11/16 00:30:56
@@ -49,17 +49,7 @@
    **    Function to display source in the source window.
  */
 TuiStatus
-#ifdef __STDC__
-tuiSetSourceContent (
-		      struct symtab *s,
-		      int lineNo,
-		      int noerror)
-#else
-tuiSetSourceContent (s, lineNo, noerror)
-     struct symtab *s;
-     int lineNo;
-     int noerror;
-#endif
+tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
 {
   TuiStatus ret = TUI_FAILURE;
 
@@ -253,15 +243,7 @@
    cannot be accessed */
 
 void
-#ifdef __STDC__
-tuiSetSourceContentNil (
-			 TuiWinInfoPtr winInfo,
-			 char *warning_string)
-#else
-tuiSetSourceContentNil (winInfo, warning_string)
-     TuiWinInfoPtr winInfo;
-     char *warning_string;
-#endif
+tuiSetSourceContentNil (TuiWinInfoPtr winInfo, char *warning_string)
 {
   int lineWidth;
   int nLines;
@@ -334,17 +316,7 @@
    **        initializes the horizontal scroll to 0.
  */
 void
-#ifdef __STDC__
-tuiShowSource (
-		struct symtab *s,
-		Opaque line,
-		int noerror)
-#else
-tuiShowSource (s, line, noerror)
-     struct symtab *s;
-     Opaque line;
-     int noerror;
-#endif
+tuiShowSource (struct symtab *s, Opaque line, int noerror)
 {
   srcWin->detail.sourceInfo.horizontalOffset = 0;
   m_tuiShowSourceAsIs (s, line, noerror);
@@ -358,13 +330,7 @@
    **        Answer whether the source is currently displayed in the source window.
  */
 int
-#ifdef __STDC__
-tuiSourceIsDisplayed (
-		       char *fname)
-#else
-tuiSourceIsDisplayed (fname)
-     char *fname;
-#endif
+tuiSourceIsDisplayed (char *fname)
 {
   return (srcWin->generic.contentInUse &&
 	  (strcmp (((TuiWinElementPtr) (locatorWinInfoPtr ())->
@@ -377,15 +343,7 @@
    **      Scroll the source forward or backward vertically
  */
 void
-#ifdef __STDC__
-tuiVerticalSourceScroll (
-			  TuiScrollDirection scrollDirection,
-			  int numToScroll)
-#else
-tuiVerticalSourceScroll (scrollDirection, numToScroll)
-     TuiScrollDirection scrollDirection;
-     int numToScroll;
-#endif
+tuiVerticalSourceScroll (TuiScrollDirection scrollDirection, int numToScroll)
 {
   if (srcWin->generic.content != (OpaquePtr) NULL)
     {
@@ -432,15 +390,7 @@
    **        the source file indicated
  */
 static struct breakpoint *
-#ifdef __STDC__
-_hasBreak (
-	    char *sourceFileName,
-	    int lineNo)
-#else
-_hasBreak (sourceFileName, lineNo)
-     char *sourceFileName;
-     int lineNo;
-#endif
+_hasBreak (char *sourceFileName, int lineNo)
 {
   struct breakpoint *bpWithBreak = (struct breakpoint *) NULL;
   struct breakpoint *bp;
Index: tui/tuiSourceWin.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiSourceWin.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 tuiSourceWin.c
--- tuiSourceWin.c	1999/07/07 20:19:30	1.1.1.2
+++ tuiSourceWin.c	2000/11/16 00:30:57
@@ -50,11 +50,7 @@
    ** tuiSrcWinIsDisplayed().
  */
 int
-#ifdef __STDC__
 tuiSrcWinIsDisplayed (void)
-#else
-tuiSrcWinIsDisplayed ()
-#endif
 {
   return (m_winPtrNotNull (srcWin) && srcWin->generic.isVisible);
 }				/* tuiSrcWinIsDisplayed */
@@ -64,11 +60,7 @@
    ** tuiAsmWinIsDisplayed().
  */
 int
-#ifdef __STDC__
 tuiAsmWinIsDisplayed (void)
-#else
-tuiAsmWinIsDisplayed ()
-#endif
 {
   return (m_winPtrNotNull (disassemWin) && disassemWin->generic.isVisible);
 }				/* tuiAsmWinIsDisplayed */
@@ -79,11 +71,7 @@
    **        Function to display the "main" routine"
  */
 void
-#ifdef __STDC__
 tuiDisplayMainFunction (void)
-#else
-tuiDisplayMainFunction ()
-#endif
 {
   if ((sourceWindows ())->count > 0)
     {
@@ -113,19 +101,8 @@
    **    initializes the horizontal scroll to 0.
  */
 void
-#ifdef __STDC__
-tuiUpdateSourceWindow (
-			TuiWinInfoPtr winInfo,
-			struct symtab *s,
-			Opaque lineOrAddr,
-			int noerror)
-#else
-tuiUpdateSourceWindow (winInfo, s, lineOrAddr, noerror)
-     TuiWinInfoPtr winInfo;
-     struct symtab *s;
-     Opaque lineOrAddr;
-     int noerror;
-#endif
+tuiUpdateSourceWindow (TuiWinInfoPtr winInfo,
+		       struct symtab *s, Opaque lineOrAddr, int noerror)
 {
   winInfo->detail.sourceInfo.horizontalOffset = 0;
   tuiUpdateSourceWindowAsIs (winInfo, s, lineOrAddr, noerror);
@@ -140,19 +117,8 @@
    **        function shows the source as specified by the horizontal offset.
  */
 void
-#ifdef __STDC__
-tuiUpdateSourceWindowAsIs (
-			    TuiWinInfoPtr winInfo,
-			    struct symtab *s,
-			    Opaque lineOrAddr,
-			    int noerror)
-#else
-tuiUpdateSourceWindowAsIs (winInfo, s, lineOrAddr, noerror)
-     TuiWinInfoPtr winInfo;
-     struct symtab *s;
-     Opaque lineOrAddr;
-     int noerror;
-#endif
+tuiUpdateSourceWindowAsIs (TuiWinInfoPtr winInfo,
+			   struct symtab *s, Opaque lineOrAddr, int noerror)
 {
   TuiStatus ret;
 
@@ -197,13 +163,7 @@
    **        reflect the input address.
  */
 void
-#ifdef __STDC__
-tuiUpdateSourceWindowsWithAddr (
-				 Opaque addr)
-#else
-tuiUpdateSourceWindowsWithAddr (addr)
-     Opaque addr;
-#endif
+tuiUpdateSourceWindowsWithAddr (Opaque addr)
 {
   if (addr > (Opaque) NULL)
     {
@@ -248,13 +208,7 @@
    **        Update the source window with the address in a va_list
  */
 void
-#ifdef __STDC__
-tui_vUpdateSourceWindowsWithAddr (
-				   va_list args)
-#else
-tui_vUpdateSourceWindowsWithAddr (args)
-     va_list args;
-#endif
+tui_vUpdateSourceWindowsWithAddr (va_list args)
 {
   Opaque addr = va_arg (args, Opaque);
 
@@ -270,15 +224,7 @@
    **        reflect the input address.
  */
 void
-#ifdef __STDC__
-tuiUpdateSourceWindowsWithLine (
-				 struct symtab *s,
-				 int line)
-#else
-tuiUpdateSourceWindowsWithLine (s, line)
-     struct symtab *s;
-     int line;
-#endif
+tuiUpdateSourceWindowsWithLine (struct symtab *s, int line)
 {
   switch (currentLayout ())
     {
@@ -302,13 +248,7 @@
    **        Update the source window with the line number in a va_list
  */
 void
-#ifdef __STDC__
-tui_vUpdateSourceWindowsWithLine (
-				   va_list args)
-#else
-tui_vUpdateSourceWindowsWithLine (args)
-     va_list args;
-#endif
+tui_vUpdateSourceWindowsWithLine (va_list args)
 {
   struct symtab *s = va_arg (args, struct symtab *);
   int line = va_arg (args, int);
@@ -323,15 +263,7 @@
    ** tuiClearSourceContent().
  */
 void
-#ifdef __STDC__
-tuiClearSourceContent (
-			TuiWinInfoPtr winInfo,
-			int displayPrompt)
-#else
-tuiClearSourceContent (winInfo, displayPrompt)
-     TuiWinInfoPtr winInfo;
-     int displayPrompt;
-#endif
+tuiClearSourceContent (TuiWinInfoPtr winInfo, int displayPrompt)
 {
   if (m_winPtrNotNull (winInfo))
     {
@@ -356,13 +288,7 @@
    ** tuiClearAllSourceWinsContent().
  */
 void
-#ifdef __STDC__
-tuiClearAllSourceWinsContent (
-			       int displayPrompt)
-#else
-tuiClearAllSourceWinsContent (displayPrompt)
-     int displayPrompt;
-#endif
+tuiClearAllSourceWinsContent (int displayPrompt)
 {
   int i;
 
@@ -378,15 +304,7 @@
    ** tuiEraseSourceContent().
  */
 void
-#ifdef __STDC__
-tuiEraseSourceContent (
-			TuiWinInfoPtr winInfo,
-			int displayPrompt)
-#else
-tuiEraseSourceContent (winInfo, displayPrompt)
-     TuiWinInfoPtr winInfo;
-     int displayPrompt;
-#endif
+tuiEraseSourceContent (TuiWinInfoPtr winInfo, int displayPrompt)
 {
   int xPos;
   int halfWidth = (winInfo->generic.width - 2) / 2;
@@ -429,13 +347,7 @@
    ** tuiEraseAllSourceContent().
  */
 void
-#ifdef __STDC__
-tuiEraseAllSourceWinsContent (
-			       int displayPrompt)
-#else
-tuiEraseAllSourceWinsContent (displayPrompt)
-     int displayPrompt;
-#endif
+tuiEraseAllSourceWinsContent (int displayPrompt)
 {
   int i;
 
@@ -451,13 +363,7 @@
    ** tuiShowSourceContent().
  */
 void
-#ifdef __STDC__
-tuiShowSourceContent (
-		       TuiWinInfoPtr winInfo)
-#else
-tuiShowSourceContent (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiShowSourceContent (TuiWinInfoPtr winInfo)
 {
   int curLine, i, curX;
 
@@ -486,11 +392,7 @@
    ** tuiShowAllSourceWinsContent()
  */
 void
-#ifdef __STDC__
 tuiShowAllSourceWinsContent (void)
-#else
-tuiShowAllSourceWinsContent ()
-#endif
 {
   int i;
 
@@ -506,17 +408,8 @@
    **      Scroll the source forward or backward horizontally
  */
 void
-#ifdef __STDC__
-tuiHorizontalSourceScroll (
-			    TuiWinInfoPtr winInfo,
-			    TuiScrollDirection direction,
-			    int numToScroll)
-#else
-tuiHorizontalSourceScroll (winInfo, direction, numToScroll)
-     TuiWinInfoPtr winInfo;
-     TuiScrollDirection direction;
-     int numToScroll;
-#endif
+tuiHorizontalSourceScroll (TuiWinInfoPtr winInfo,
+			   TuiScrollDirection direction, int numToScroll)
 {
   if (winInfo->generic.content != (OpaquePtr) NULL)
     {
@@ -557,15 +450,7 @@
    **        Set or clear the hasBreak flag in the line whose line is lineNo.
  */
 void
-#ifdef __STDC__
-tuiSetIsExecPointAt (
-		      Opaque lineOrAddr,
-		      TuiWinInfoPtr winInfo)
-#else
-tuiSetIsExecPointAt (lineOrAddr, winInfo)
-     Opaque lineOrAddr;
-     TuiWinInfoPtr winInfo;
-#endif
+tuiSetIsExecPointAt (Opaque lineOrAddr, TuiWinInfoPtr winInfo)
 {
   int i;
   TuiWinContent content = (TuiWinContent) winInfo->generic.content;
@@ -589,17 +474,7 @@
    **        Set or clear the hasBreak flag in the line whose line is lineNo.
  */
 void
-#ifdef __STDC__
-tuiSetHasBreakAt (
-		   struct breakpoint *bp,
-		   TuiWinInfoPtr winInfo,
-		   int hasBreak)
-#else
-tuiSetHasBreakAt (bp, winInfo, hasBreak)
-     struct breakpoint *bp;
-     TuiWinInfoPtr winInfo;
-     int hasBreak;
-#endif
+tuiSetHasBreakAt (struct breakpoint *bp, TuiWinInfoPtr winInfo, int hasBreak)
 {
   int i;
   TuiWinContent content = (TuiWinContent) winInfo->generic.content;
@@ -647,15 +522,7 @@
    **        Set or clear the hasBreak flag in all displayed source windows.
  */
 void
-#ifdef __STDC__
-tuiAllSetHasBreakAt (
-		      struct breakpoint *bp,
-		      int hasBreak)
-#else
-tuiAllSetHasBreakAt (bp, hasBreak)
-     struct breakpoint *bp;
-     int hasBreak;
-#endif
+tuiAllSetHasBreakAt (struct breakpoint *bp, int hasBreak)
 {
   int i;
 
@@ -673,13 +540,7 @@
    **        with params in a va_list
  */
 void
-#ifdef __STDC__
-tui_vAllSetHasBreakAt (
-			va_list args)
-#else
-tui_vAllSetHasBreakAt (args)
-     va_list args;
-#endif
+tui_vAllSetHasBreakAt (va_list args)
 {
   struct breakpoint *bp = va_arg (args, struct breakpoint *);
   int hasBreak = va_arg (args, int);
@@ -702,13 +563,7 @@
    **      disassembly window.
  */
 TuiStatus
-#ifdef __STDC__
-tuiSetExecInfoContent (
-			TuiWinInfoPtr winInfo)
-#else
-tuiSetExecInfoContent (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiSetExecInfoContent (TuiWinInfoPtr winInfo)
 {
   TuiStatus ret = TUI_SUCCESS;
 
@@ -789,13 +644,7 @@
    ** tuiShowExecInfoContent().
  */
 void
-#ifdef __STDC__
-tuiShowExecInfoContent (
-			 TuiWinInfoPtr winInfo)
-#else
-tuiShowExecInfoContent (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiShowExecInfoContent (TuiWinInfoPtr winInfo)
 {
   TuiGenWinInfoPtr execInfo = winInfo->detail.sourceInfo.executionInfo;
   int curLine;
@@ -819,11 +668,7 @@
    ** tuiShowAllExecInfosContent()
  */
 void
-#ifdef __STDC__
 tuiShowAllExecInfosContent (void)
-#else
-tuiShowAllExecInfosContent ()
-#endif
 {
   int i;
 
@@ -838,13 +683,7 @@
    ** tuiEraseExecInfoContent().
  */
 void
-#ifdef __STDC__
-tuiEraseExecInfoContent (
-			  TuiWinInfoPtr winInfo)
-#else
-tuiEraseExecInfoContent (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiEraseExecInfoContent (TuiWinInfoPtr winInfo)
 {
   TuiGenWinInfoPtr execInfo = winInfo->detail.sourceInfo.executionInfo;
 
@@ -859,11 +698,7 @@
    ** tuiEraseAllExecInfosContent()
  */
 void
-#ifdef __STDC__
 tuiEraseAllExecInfosContent (void)
-#else
-tuiEraseAllExecInfosContent ()
-#endif
 {
   int i;
 
@@ -878,13 +713,7 @@
    ** tuiClearExecInfoContent().
  */
 void
-#ifdef __STDC__
-tuiClearExecInfoContent (
-			  TuiWinInfoPtr winInfo)
-#else
-tuiClearExecInfoContent (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiClearExecInfoContent (TuiWinInfoPtr winInfo)
 {
   winInfo->detail.sourceInfo.executionInfo->contentInUse = FALSE;
   tuiEraseExecInfoContent (winInfo);
@@ -897,11 +726,7 @@
    ** tuiClearAllExecInfosContent()
  */
 void
-#ifdef __STDC__
 tuiClearAllExecInfosContent (void)
-#else
-tuiClearAllExecInfosContent ()
-#endif
 {
   int i;
 
@@ -917,13 +742,7 @@
    **        Function to update the execution info window
  */
 void
-#ifdef __STDC__
-tuiUpdateExecInfo (
-		    TuiWinInfoPtr winInfo)
-#else
-tuiUpdateExecInfo (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiUpdateExecInfo (TuiWinInfoPtr winInfo)
 {
   tuiSetExecInfoContent (winInfo);
   tuiShowExecInfoContent (winInfo);
@@ -934,11 +753,7 @@
 				   ** tuiUpdateAllExecInfos()
 				 */
 void
-#ifdef __STDC__
 tuiUpdateAllExecInfos (void)
-#else
-tuiUpdateAllExecInfos ()
-#endif
 {
   int i;
 
@@ -957,11 +772,7 @@
    **       is called then the target terminates execution
  */
 void
-#ifdef __STDC__
 tuiUpdateOnEnd (void)
-#else
-tuiUpdateOnEnd ()
-#endif
 {
   int i;
   TuiGenWinInfoPtr locator;
@@ -998,13 +809,7 @@
 
 
 TuiStatus
-#ifdef __STDC__
-tuiAllocSourceBuffer (
-		       TuiWinInfoPtr winInfo)
-#else
-tuiAllocSourceBuffer (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiAllocSourceBuffer (TuiWinInfoPtr winInfo)
 {
   register char *srcLine, *srcLineBuf;
   register int i, lineWidth, c, maxLines;
@@ -1056,17 +861,8 @@
    **      in the current source window.
  */
 int
-#ifdef __STDC__
-tuiLineIsDisplayed (
-		     Opaque lineNoOrAddr,
-		     TuiWinInfoPtr winInfo,
-		     int checkThreshold)
-#else
-tuiLineIsDisplayed (lineNoOrAddr, winInfo, checkThreshold)
-     Opaque lineNoOrAddr;
-     TuiWinInfoPtr winInfo;
-     int checkThreshold;
-#endif
+tuiLineIsDisplayed (Opaque lineNoOrAddr,
+		    TuiWinInfoPtr winInfo, int checkThreshold)
 {
   int isDisplayed = FALSE;
   int i, threshold;
Index: tui/tuiStack.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiStack.c,v
retrieving revision 1.3
diff -u -r1.3 tuiStack.c
--- tuiStack.c	2000/07/30 01:48:28	1.3
+++ tuiStack.c	2000/11/16 00:30:57
@@ -30,11 +30,7 @@
    ** tuiClearLocatorDisplay()
  */
 void
-#ifdef __STDC__
 tuiClearLocatorDisplay (void)
-#else
-tuiClearLocatorDisplay ()
-#endif
 {
   TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
   int i;
@@ -63,11 +59,7 @@
    ** tuiShowLocatorContent()
  */
 void
-#ifdef __STDC__
 tuiShowLocatorContent (void)
-#else
-tuiShowLocatorContent ()
-#endif
 {
   char *string;
   TuiGenWinInfoPtr locator;
@@ -100,21 +92,9 @@
    **        Function to update the locator, with the provided arguments.
  */
 void
-#ifdef __STDC__
-tuiSetLocatorInfo (
-		    char *fname,
-		    char *procname,
-		    int lineNo,
-		    Opaque addr,
-		    TuiLocatorElementPtr element)
-#else
-tuiSetLocatorInfo (fname, procname, lineNo, addr, element)
-     char *fname;
-     char *procname;
-     int lineNo;
-     Opaque addr;
-     TuiLocatorElementPtr element;
-#endif
+tuiSetLocatorInfo (char *fname,
+		   char *procname,
+		   int lineNo, Opaque addr, TuiLocatorElementPtr element)
 {
 #ifdef COMMENT
   /* first free the old info */
@@ -149,13 +129,7 @@
    **        Update only the filename portion of the locator.
  */
 void
-#ifdef __STDC__
-tuiUpdateLocatorFilename (
-			   char *fileName)
-#else
-tuiUpdateLocatorFilename (fileName)
-     char *fileName;
-#endif
+tuiUpdateLocatorFilename (char *fileName)
 {
   TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
 
@@ -177,13 +151,7 @@
    **        Update only the filename portion of the locator with args in a va_list.
  */
 void
-#ifdef __STDC__
-tui_vUpdateLocatorFilename (
-			     va_list args)
-#else
-tui_vUpdateLocatorFilename (args)
-     va_list args;
-#endif
+tui_vUpdateLocatorFilename (va_list args)
 {
   char *fileName;
 
@@ -200,13 +168,7 @@
    ** (elz)
  */
 void
-#ifdef __STDC__
-tuiSwitchFilename (
-		    char *fileName)
-#else
-tuiSwitchFilename (fileName)
-     char *fileName;
-#endif
+tuiSwitchFilename (char *fileName)
 {
   TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
 
@@ -232,15 +194,7 @@
    ** (elz)
  */
 void
-#ifdef __STDC__
-tuiGetLocatorFilename (
-			TuiGenWinInfoPtr locator,
-			char **filename)
-#else
-tuiGetLocatorFilename (locator, filename)
-     TuiGenWinInfoPtr locator;
-     char **filename;
-#endif
+tuiGetLocatorFilename (TuiGenWinInfoPtr locator, char **filename)
 {
 
   /* the current filename could be non known, in which case the xmalloc would
@@ -264,15 +218,8 @@
    **        Function to update the locator, with the information extracted from frameInfo
  */
 void
-#ifdef __STDC__
-tuiUpdateLocatorInfoFromFrame (
-				struct frame_info *frameInfo,
-				TuiLocatorElementPtr element)
-#else
-tuiUpdateLocatorInfoFromFrame (frameInfo, element)
-     struct frame_info *frameInfo;
-     TuiLocatorElementPtr element;
-#endif
+tuiUpdateLocatorInfoFromFrame (struct frame_info *frameInfo,
+			       TuiLocatorElementPtr element)
 {
   struct symtab_and_line symtabAndLine;
 
@@ -303,13 +250,7 @@
    **        Function to set the content of the locator
  */
 void
-#ifdef __STDC__
-tuiSetLocatorContent (
-		       struct frame_info *frameInfo)
-#else
-tuiSetLocatorContent (frameInfo)
-     struct frame_info *frameInfo;
-#endif
+tuiSetLocatorContent (struct frame_info *frameInfo)
 {
   TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
   TuiWinElementPtr element;
@@ -343,13 +284,7 @@
    **        Function to update the locator display
  */
 void
-#ifdef __STDC__
-tuiUpdateLocatorDisplay (
-			  struct frame_info *frameInfo)
-#else
-tuiUpdateLocatorDisplay (frameInfo)
-     struct frame_info *frameInfo;
-#endif
+tuiUpdateLocatorDisplay (struct frame_info *frameInfo)
 {
   tuiClearLocatorDisplay ();
   tuiSetLocatorContent (frameInfo);
@@ -364,13 +299,7 @@
    **        Function to print the frame inforrmation for the TUI.
  */
 void
-#ifdef __STDC__
-tuiShowFrameInfo (
-		   struct frame_info *fi)
-#else
-tuiShowFrameInfo (fi)
-     struct frame_info *fi;
-#endif
+tuiShowFrameInfo (struct frame_info *fi)
 {
   TuiWinInfoPtr winInfo;
   register int i;
@@ -453,13 +382,7 @@
    **        Function to print the frame inforrmation for the TUI with args in a va_list.
  */
 void
-#ifdef __STDC__
-tui_vShowFrameInfo (
-		     va_list args)
-#else
-tui_vShowFrameInfo (args)
-     va_list args;
-#endif
+tui_vShowFrameInfo (va_list args)
 {
   struct frame_info *fi;
 
@@ -495,13 +418,7 @@
    **    _getFuncNameFromFrame().
  */
 static char *
-#ifdef __STDC__
-_getFuncNameFromFrame (
-			struct frame_info *frameInfo)
-#else
-_getFuncNameFromFrame (frameInfo)
-     struct frame_info *frameInfo;
-#endif
+_getFuncNameFromFrame (struct frame_info *frameInfo)
 {
   char *funcName = (char *) NULL;
 
@@ -518,15 +435,7 @@
    **        Command to update the display with the current execution point
  */
 static void
-#ifdef __STDC__
-_tuiUpdateLocation_command (
-			     char *arg,
-			     int fromTTY)
-#else
-_tuiUpdateLocation_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiUpdateLocation_command (char *arg, int fromTTY)
 {
 #ifndef TRY
 extern void frame_command (char *, int);
Index: tui/tuiWin.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiWin.c,v
retrieving revision 1.3
diff -u -r1.3 tuiWin.c
--- tuiWin.c	2000/07/30 01:48:28	1.3
+++ tuiWin.c	2000/11/16 00:30:58
@@ -116,13 +116,7 @@
    **        Clear the logical focus from winInfo
  */
 void
-#ifdef __STDC__
-tuiClearWinFocusFrom (
-		       TuiWinInfoPtr winInfo)
-#else
-tuiClearWinFocusFrom (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiClearWinFocusFrom (TuiWinInfoPtr winInfo)
 {
   if (m_winPtrNotNull (winInfo))
     {
@@ -140,11 +134,7 @@
    **        Clear the window that has focus.
  */
 void
-#ifdef __STDC__
 tuiClearWinFocus (void)
-#else
-tuiClearWinFocus ()
-#endif
 {
   tuiClearWinFocusFrom (tuiWinWithFocus ());
 
@@ -157,13 +147,7 @@
    **        Set the logical focus to winInfo
  */
 void
-#ifdef __STDC__
-tuiSetWinFocusTo (
-		   TuiWinInfoPtr winInfo)
-#else
-tuiSetWinFocusTo (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+tuiSetWinFocusTo (TuiWinInfoPtr winInfo)
 {
   if (m_winPtrNotNull (winInfo))
     {
@@ -182,13 +166,7 @@
 
 
 char *
-#ifdef __STDC__
-tuiStrDup (
-	    char *str)
-#else
-tuiStrDup (str)
-     char *str;
-#endif
+tuiStrDup (char *str)
 {
   char *newStr = (char *) NULL;
 
@@ -206,15 +184,7 @@
    ** tuiScrollForward().
  */
 void
-#ifdef __STDC__
-tuiScrollForward (
-		   TuiWinInfoPtr winToScroll,
-		   int numToScroll)
-#else
-tuiScrollForward (winToScroll, numToScroll)
-     TuiWinInfoPtr winToScroll;
-     int numToScroll;
-#endif
+tuiScrollForward (TuiWinInfoPtr winToScroll, int numToScroll)
 {
   if (winToScroll != cmdWin)
     {
@@ -244,15 +214,7 @@
    ** tuiScrollBackward().
  */
 void
-#ifdef __STDC__
-tuiScrollBackward (
-		    TuiWinInfoPtr winToScroll,
-		    int numToScroll)
-#else
-tuiScrollBackward (winToScroll, numToScroll)
-     TuiWinInfoPtr winToScroll;
-     int numToScroll;
-#endif
+tuiScrollBackward (TuiWinInfoPtr winToScroll, int numToScroll)
 {
   if (winToScroll != cmdWin)
     {
@@ -281,15 +243,7 @@
    ** tuiScrollLeft().
  */
 void
-#ifdef __STDC__
-tuiScrollLeft (
-		TuiWinInfoPtr winToScroll,
-		int numToScroll)
-#else
-tuiScrollLeft (winToScroll, numToScroll)
-     TuiWinInfoPtr winToScroll;
-     int numToScroll;
-#endif
+tuiScrollLeft (TuiWinInfoPtr winToScroll, int numToScroll)
 {
   if (winToScroll != cmdWin)
     {
@@ -314,15 +268,7 @@
    ** tuiScrollRight().
  */
 void
-#ifdef __STDC__
-tuiScrollRight (
-		 TuiWinInfoPtr winToScroll,
-		 int numToScroll)
-#else
-tuiScrollRight (winToScroll, numToScroll)
-     TuiWinInfoPtr winToScroll;
-     int numToScroll;
-#endif
+tuiScrollRight (TuiWinInfoPtr winToScroll, int numToScroll)
 {
   if (winToScroll != cmdWin)
     {
@@ -348,13 +294,7 @@
    **    Scroll a window.  Arguments are passed through a va_list.
  */
 void
-#ifdef __STDC__
-tui_vScroll (
-	      va_list args)
-#else
-tui_vScroll (args)
-     va_list args;
-#endif
+tui_vScroll (va_list args)
 {
   TuiScrollDirection direction = va_arg (args, TuiScrollDirection);
   TuiWinInfoPtr winToScroll = va_arg (args, TuiWinInfoPtr);
@@ -386,11 +326,7 @@
    ** tuiRefreshAll().
  */
 void
-#ifdef __STDC__
 tuiRefreshAll (void)
-#else
-tuiRefreshAll ()
-#endif
 {
   TuiWinType type;
 
@@ -432,11 +368,7 @@
    **      function gets called from within the readline sinwinch handler.
  */
 void
-#ifdef __STDC__
 tuiResizeAll (void)
-#else
-tuiResizeAll ()
-#endif
 {
   int heightDiff, widthDiff;
   extern int screenheight, screenwidth;		/* in readline */
@@ -599,13 +531,7 @@
    **    because it is set as the old_sigwinch() (TUI only)
  */
 void
-#ifdef __STDC__
-tuiSigwinchHandler (
-		     int signal)
-#else
-tuiSigwinchHandler (signal)
-     int signal;
-#endif
+tuiSigwinchHandler (int signal)
 {
   /*
      ** Say that a resize was done so that the readline can do it
@@ -627,15 +553,7 @@
    ** _tuiScrollForward_command().
  */
 static void
-#ifdef __STDC__
-_tuiScrollForward_command (
-			    char *arg,
-			    int fromTTY)
-#else
-_tuiScrollForward_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiScrollForward_command (char *arg, int fromTTY)
 {
   int numToScroll = 1;
   TuiWinInfoPtr winToScroll;
@@ -657,15 +575,7 @@
    ** _tuiScrollBackward_command().
  */
 static void
-#ifdef __STDC__
-_tuiScrollBackward_command (
-			     char *arg,
-			     int fromTTY)
-#else
-_tuiScrollBackward_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiScrollBackward_command (char *arg, int fromTTY)
 {
   int numToScroll = 1;
   TuiWinInfoPtr winToScroll;
@@ -687,15 +597,7 @@
    ** _tuiScrollLeft_command().
  */
 static void
-#ifdef __STDC__
-_tuiScrollLeft_command (
-			 char *arg,
-			 int fromTTY)
-#else
-_tuiScrollLeft_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiScrollLeft_command (char *arg, int fromTTY)
 {
   int numToScroll;
   TuiWinInfoPtr winToScroll;
@@ -714,15 +616,7 @@
    ** _tuiScrollRight_command().
  */
 static void
-#ifdef __STDC__
-_tuiScrollRight_command (
-			  char *arg,
-			  int fromTTY)
-#else
-_tuiScrollRight_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiScrollRight_command (char *arg, int fromTTY)
 {
   int numToScroll;
   TuiWinInfoPtr winToScroll;
@@ -742,15 +636,7 @@
    **     Set focus to the window named by 'arg'
  */
 static void
-#ifdef __STDC__
-_tuiSetFocus (
-	       char *arg,
-	       int fromTTY)
-#else
-_tuiSetFocus (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiSetFocus (char *arg, int fromTTY)
 {
   if (arg != (char *) NULL)
     {
@@ -794,13 +680,7 @@
    ** _tui_vSetFocus()
  */
 static void
-#ifdef __STDC__
-_tui_vSetFocus (
-		 va_list args)
-#else
-_tui_vSetFocus (args)
-     va_list args;
-#endif
+_tui_vSetFocus (va_list args)
 {
   char *arg = va_arg (args, char *);
   int fromTTY = va_arg (args, int);
@@ -815,15 +695,7 @@
    ** _tuiSetFocus_command()
  */
 static void
-#ifdef __STDC__
-_tuiSetFocus_command (
-		       char *arg,
-		       int fromTTY)
-#else
-_tuiSetFocus_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiSetFocus_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) _tui_vSetFocus, arg, fromTTY);
 
@@ -835,15 +707,7 @@
    ** _tuiAllWindowsInfo().
  */
 static void
-#ifdef __STDC__
-_tuiAllWindowsInfo (
-		     char *arg,
-		     int fromTTY)
-#else
-_tuiAllWindowsInfo (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiAllWindowsInfo (char *arg, int fromTTY)
 {
   TuiWinType type;
   TuiWinInfoPtr winWithFocus = tuiWinWithFocus ();
@@ -869,15 +733,7 @@
    ** _tuiRefreshAll_command().
  */
 static void
-#ifdef __STDC__
-_tuiRefreshAll_command (
-			 char *arg,
-			 int fromTTY)
-#else
-_tuiRefreshAll_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiRefreshAll_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) tuiRefreshAll);
 }
@@ -888,15 +744,7 @@
    **        Set the height of the specified window.
  */
 static void
-#ifdef __STDC__
-_tuiSetTabWidth_command (
-			  char *arg,
-			  int fromTTY)
-#else
-_tuiSetTabWidth_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiSetTabWidth_command (char *arg, int fromTTY)
 {
   if (arg != (char *) NULL)
     {
@@ -918,15 +766,7 @@
    **        Set the height of the specified window.
  */
 static void
-#ifdef __STDC__
-_tuiSetWinHeight (
-		   char *arg,
-		   int fromTTY)
-#else
-_tuiSetWinHeight (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiSetWinHeight (char *arg, int fromTTY)
 {
   if (arg != (char *) NULL)
     {
@@ -1015,13 +855,7 @@
    **        Set the height of the specified window, with va_list.
  */
 static void
-#ifdef __STDC__
-_tui_vSetWinHeight (
-		     va_list args)
-#else
-_tui_vSetWinHeight (args)
-     va_list args;
-#endif
+_tui_vSetWinHeight (va_list args)
 {
   char *arg = va_arg (args, char *);
   int fromTTY = va_arg (args, int);
@@ -1037,15 +871,7 @@
    **        Set the height of the specified window, with va_list.
  */
 static void
-#ifdef __STDC__
-_tuiSetWinHeight_command (
-			   char *arg,
-			   int fromTTY)
-#else
-_tuiSetWinHeight_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiSetWinHeight_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) _tui_vSetWinHeight, arg, fromTTY);
 
@@ -1059,15 +885,7 @@
    **        increase or decrease the command window by the specified amount.
  */
 static void
-#ifdef __STDC__
-_tuiXDBsetWinHeight (
-		      char *arg,
-		      int fromTTY)
-#else
-_tuiXDBsetWinHeight (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiXDBsetWinHeight (char *arg, int fromTTY)
 {
   if (arg != (char *) NULL)
     {
@@ -1099,13 +917,7 @@
    **        Set the height of the specified window, with va_list.
  */
 static void
-#ifdef __STDC__
-_tui_vXDBsetWinHeight (
-			va_list args)
-#else
-_tui_vXDBsetWinHeight (args)
-     va_list args;
-#endif
+_tui_vXDBsetWinHeight (va_list args)
 {
   char *arg = va_arg (args, char *);
   int fromTTY = va_arg (args, int);
@@ -1121,15 +933,7 @@
    **        Set the height of the specified window, with va_list.
  */
 static void
-#ifdef __STDC__
-_tuiXDBsetWinHeight_command (
-			      char *arg,
-			      int fromTTY)
-#else
-_tuiXDBsetWinHeight_command (arg, fromTTY)
-     char *arg;
-     int fromTTY;
-#endif
+_tuiXDBsetWinHeight_command (char *arg, int fromTTY)
 {
   tuiDo ((TuiOpaqueFuncPtr) _tui_vXDBsetWinHeight, arg, fromTTY);
 
@@ -1142,15 +946,7 @@
    **        Function to adjust all window heights around the primary
  */
 static TuiStatus
-#ifdef __STDC__
-_tuiAdjustWinHeights (
-		       TuiWinInfoPtr primaryWinInfo,
-		       int newHeight)
-#else
-_tuiAdjustWinHeights (primaryWinInfo, newHeight)
-     TuiWinInfoPtr primaryWinInfo;
-     int newHeight;
-#endif
+_tuiAdjustWinHeights (TuiWinInfoPtr primaryWinInfo, int newHeight)
 {
   TuiStatus status = TUI_FAILURE;
 
@@ -1304,15 +1100,7 @@
    **        with the targer) invisible, and set the new height and location.
  */
 static void
-#ifdef __STDC__
-_makeInvisibleAndSetNewHeight (
-				TuiWinInfoPtr winInfo,
-				int height)
-#else
-_makeInvisibleAndSetNewHeight (winInfo, height)
-     TuiWinInfoPtr winInfo;
-     int height;
-#endif
+_makeInvisibleAndSetNewHeight (TuiWinInfoPtr winInfo, int height)
 {
   int i;
   struct symtab *s;
@@ -1376,13 +1164,7 @@
    **        had to be destroyed to be made invisible.
  */
 static void
-#ifdef __STDC__
-_makeVisibleWithNewHeight (
-			    TuiWinInfoPtr winInfo)
-#else
-_makeVisibleWithNewHeight (winInfo)
-     TuiWinInfoPtr winInfo;
-#endif
+_makeVisibleWithNewHeight (TuiWinInfoPtr winInfo)
 {
   int i;
   struct symtab *s;
@@ -1451,15 +1233,7 @@
 
 
 static int
-#ifdef __STDC__
-_newHeightOk (
-	       TuiWinInfoPtr primaryWinInfo,
-	       int newHeight)
-#else
-_newHeightOk (primaryWinInfo, newHeight)
-     TuiWinInfoPtr primaryWinInfo;
-     int newHeight;
-#endif
+_newHeightOk (TuiWinInfoPtr primaryWinInfo, int newHeight)
 {
   int ok = (newHeight < termHeight ());
 
@@ -1575,17 +1349,7 @@
    ** _parseScrollingArgs().
  */
 static void
-#ifdef __STDC__
-_parseScrollingArgs (
-		      char *arg,
-		      TuiWinInfoPtr * winToScroll,
-		      int *numToScroll)
-#else
-_parseScrollingArgs (arg, winToScroll, numToScroll)
-     char *arg;
-     TuiWinInfoPtr *winToScroll;
-     int *numToScroll;
-#endif
+_parseScrollingArgs (char *arg, TuiWinInfoPtr * winToScroll, int *numToScroll)
 {
   if (numToScroll)
     *numToScroll = 0;


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]