Use proper prototypes for snprintf, vsnprintf.

[wget] / src / sysdep.h

diff --git a/src/sysdep.h b/src/sysdep.h
index ec50e0452c99635db37ea1ec40536c7d21b642ca..e0dcdeeaf45a3fade5edbf91ab05d8663db127e9 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,6 +1,6 @@
 /* Dirty system-dependent hacks.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -41,6 +41,10 @@ as that of the covered work.  */
 # endif
 #endif
 
+#if defined(__INTERIX) && !defined(_ALL_SOURCE)
+# define _ALL_SOURCE
+#endif
+
 /* The "namespace tweaks" below attempt to set a friendly "compilation
    environment" under popular operating systems.  Default compilation
    environment often means that some functions that are "extensions"
@@ -57,7 +61,7 @@ as that of the covered work.  */
 # define NAMESPACE_TWEAKS
 #endif
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
 # define NAMESPACE_TWEAKS
 #endif
 
@@ -68,7 +72,7 @@ as that of the covered work.  */
 
 /* For Solaris: request everything else that is available and doesn't
    conflict with the above.  */
-#define __EXTENSIONS__
+/* #define __EXTENSIONS__ */ /* XXX clashes with config.h */
 
 /* For Linux: request features of 4.3BSD and SVID (System V Interface
    Definition). */
@@ -78,7 +82,7 @@ as that of the covered work.  */
 /* Under glibc-based systems we want all GNU extensions as well.  This
    declares some unnecessary cruft, but also useful functions such as
    timegm, FNM_CASEFOLD extension to fnmatch, memrchr, etc.  */
-#define _GNU_SOURCE
+/* #define _GNU_SOURCE */ /* XXX clashes with config.h */
 
 #endif /* NAMESPACE_TWEAKS */
 
@@ -212,10 +216,11 @@ void *memrchr (const void *, int, size_t);
 /* These are defined in snprintf.c.  It would be nice to have an
    snprintf.h, though.  */
 #ifndef HAVE_SNPRINTF
-int snprintf ();
+int snprintf (char *str, size_t count, const char *fmt, ...);
 #endif
 #ifndef HAVE_VSNPRINTF
-int vsnprintf ();
+#include <stdarg.h>
+int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
 #endif
 
 /* Some systems (Linux libc5, "NCR MP-RAS 3.0", and others) don't