X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fsysdep.h;h=069882a72388227146f7e2536aca285ba825af1b;hp=580e3d55b3fd1312d7418e1460fd70d42876d902;hb=HEAD;hpb=212396c7e1de6592294f92230254afdfd553843c
diff --git a/src/sysdep.h b/src/sysdep.h
index 580e3d55..069882a7 100644
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,6 +1,7 @@
/* Dirty system-dependent hacks.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+ Inc.
This file is part of GNU Wget.
@@ -17,15 +18,16 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Wget. If not, see .
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables. You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL". If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version. */
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work. */
/* This file is included by wget.h. Random .c files need not include
it. */
@@ -40,6 +42,10 @@ so, delete this exception statement from your version. */
# 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"
@@ -56,7 +62,7 @@ so, delete this exception statement from your version. */
# define NAMESPACE_TWEAKS
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
# define NAMESPACE_TWEAKS
#endif
@@ -65,20 +71,6 @@ so, delete this exception statement from your version. */
/* Request the "Unix 98 compilation environment". */
#define _XOPEN_SOURCE 500
-/* For Solaris: request everything else that is available and doesn't
- conflict with the above. */
-#define __EXTENSIONS__
-
-/* For Linux: request features of 4.3BSD and SVID (System V Interface
- Definition). */
-#define _SVID_SOURCE
-#define _BSD_SOURCE
-
-/* 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
-
#endif /* NAMESPACE_TWEAKS */
@@ -111,6 +103,8 @@ void *alloca (size_t);
#include
#ifdef HAVE_INTTYPES_H
+ /* Compaq C V6.5-303 (dtk) on HP Tru64 UNIX V5.1B (Rev. 2650) needs: */
+# include
# include
#endif
@@ -124,23 +118,8 @@ void *alloca (size_t);
# include "mswindows.h"
#endif
-/* Provide support for C99-type boolean type "bool". This blurb comes
- straight from the Autoconf 2.59 manual. */
-#if HAVE_STDBOOL_H
+/* Provided by gnulib on systems that don't have it: */
# include
-#else
-# if ! HAVE__BOOL
-# ifdef __cplusplus
-typedef bool _Bool;
-# else
-typedef unsigned char _Bool;
-# endif
-# endif
-# define bool _Bool
-# define false 0
-# define true 1
-# define __bool_true_false_are_defined 1
-#endif
/* Needed for compilation under OS/2 and MSDOS */
#if defined(__EMX__) || defined(MSDOS)
@@ -209,10 +188,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
+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
@@ -242,10 +222,10 @@ int vsnprintf ();
# undef FNM_PERIOD
# undef FNM_NOMATCH
-# define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */
-# define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */
-# define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */
-# define FNM_NOMATCH 1
+# define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */
+# define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */
+# define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */
+# define FNM_NOMATCH 1
int fnmatch (const char *, const char *, int);
#endif