* debugify.c, debugify.h: Make safe for non-ansi compilers.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 733b52cff8ff3d530574d2a2ff7695122cf61567..742795bf6871455dcbbe13300437bf5d63bb9488 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,8 @@
 
+Wed Feb 12 15:58:00 1997  Dawn Perchik  <dawn@cygnus.com>
+
+       * debugify.c, debugify.h: Make safe for non-ansi compilers.
+
 Wed Feb 12 15:30:00 1997  Dawn Perchik  <dawn@cygnus.com>
 
        * defs.h: Fix prototypes for new cleanup functions.

diff --git a/gdb/debugify.c b/gdb/debugify.c
index b5c27543ac093d5a336a589d50ca4f21ff67dca6..8411e3535bd030083d5c77daf0229700d02940ce 100644 (file)
--- a/gdb/debugify.c
+++ b/gdb/debugify.c
@@ -28,12 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #else
 #include <strings.h>
 #endif
-#ifdef ANSI_PROTOTYPES
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 
 #define DEBUGIFY
 #include "debugify.h"
@@ -45,7 +39,8 @@ static char fname[128];
 static int file_cnt = 0;       /* count number of open files */
 
 void 
-puts_dbg (const char *data)
+puts_dbg (data)
+  const char *data;
 {
   FILE *fdbg;
 
@@ -58,7 +53,9 @@ puts_dbg (const char *data)
 
 /* Can't easily get the message back to gdb... write to a log instead. */
 void 
-fputs_dbg (const char *data, FILE * fakestream)
+fputs_dbg (data, fakestream)
+  const char *data;
+  FILE *fakestream;
 {
 #ifdef REDIRECT
   puts_dbg (data);
@@ -88,11 +85,23 @@ fputs_dbg (const char *data, FILE * fakestream)
 }
 
 void 
+#ifdef ANSI_PROTOTYPES
 printf_dbg (const char *format,...)
+#else
+printf_dbg (va_alist) 
+     va_dcl
+#endif
 {
   va_list args;
   char buf[256];
+#ifdef ANSI_PROTOTYPES
   va_start (args, format);
+#else
+  char *format;
+
+  va_start (args);
+  format = va_arg (args, char *); 
+#endif
   vsprintf (buf, format, args);
   puts_dbg (buf);
   va_end (args);

diff --git a/gdb/debugify.h b/gdb/debugify.h
index 78af28ee0c900c16a9c1643461921ae2b2b96307..b4ae92bc93b76da69f1beb901f32303d63ebf19c 100644 (file)
--- a/gdb/debugify.h
+++ b/gdb/debugify.h
@@ -22,14 +22,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifndef _DEBUGIFY_H_
 #define _DEBUGIFY_H_
 
+#include "ansidecl.h"
+
+#ifdef ANSI_PROTOTYPES
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
 #ifdef DEBUGIFY
 #include <assert.h>
 #ifdef TO_SCREEN
+#ifdef _Win32
 #define DBG(x) OutputDebugString x
+#else
+#define DBG(x) printf x
+#endif
 #elif TO_GDB
 #define DBG(x) printf_unfiltered x
 #elif TO_POPUP
+#ifdef _Win32
 #define DBG(x) MessageBox x
+#else
+#define DBG(x) printf x
+#endif
 #else /* default: TO_FILE "gdb.log" */
 #define DBG(x) printf_dbg x
 #endif
@@ -53,7 +69,12 @@ extern "C"
 #endif /* REDIRECT */
 
   extern void puts_dbg PARAMS ((const char *fmt));
+#ifdef ANSI_PROTOTYPES
   extern void printf_dbg PARAMS ((const char *fmt,...));
+#else
+  extern void printf_dbg PARAMS ((va_alist va_dcl));
+#endif
+
 
 #ifdef __cplusplus
 }