Changeset 2468 for trunk/gsdl/src/mgpp/lib/xmalloc.c

Timestamp:

2001-05-24T17:06:48+12:00 (23 years ago)

Author:

sjboddie

Message:

Fiddled about with mgpp to get it compiling on Windows under VC++ 6.0. I
still can't get it to compile under VC++ 4.2 because of some weird
behaviour in STLport.

Also tidied up a little and removed some of the old log information
that was scattered about in some of the files.

File:

• trunk/gsdl/src/mgpp/lib/xmalloc.c (modified) (3 diffs)

trunk/gsdl/src/mgpp/lib/xmalloc.c

@@ -56 +56 @@
 int xmalloc_exit_failure = EXIT_FAILURE;
 
+#if defined(__WIN32__)
+void error (int, int, const char *, ...);
+#else
 #if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
 void error (int, int, const char *, ...);
 #else
-void error ();
+void error (int, int, char *, char *, char *, char *, char *, char *, char *, char *, char *);
 #endif
+#endif;
 
 static VOID *
-fixup_null_alloc (size_t n)
+fixup_null_alloc (n)
+     size_t n;
 {
   VOID *p;
@@ -78 +83 @@
 
 VOID *
-xmalloc (size_t n)
+xmalloc (n)
+     size_t n;
 {
   VOID *p;
@@ -93 +99 @@
 
 VOID *
-xrealloc (VOID *p, size_t n)
+xrealloc (p, n)
+     VOID *p;
+     size_t n;
 {
   if (p == 0)