[svn] Added sanity checks for -k, -p, -r and -N when -O is given. Added fixes for...

[wget] / src / sysdep.h

diff --git a/src/sysdep.h b/src/sysdep.h
index 408083f885cc613fe35acc5324ae1d9da21831ee..4df419c9ccbd9b0bcbac1ebb0de86750fafeb09e 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,5 +1,5 @@
 /* Dirty system-dependent hacks.
-   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -14,8 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+along with Wget; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -49,7 +49,7 @@ so, delete this exception statement from your version.  */
    well as to pick up Windows-specific includes and constants.  To be
    able to test for such features, the file must be included as early
    as possible.  */
-# include <mswindows.h>
+# include "mswindows.h"
 #endif
 
 /* Provide support for C99-type boolean type "bool".  This blurb comes
@@ -112,13 +112,8 @@ typedef unsigned char _Bool;
 # define CHAR_BIT 8
 #endif
 
-/* Used by wget.h to define SIZEOF_WGINT. */
-#ifndef LONG_MAX
-# define LONG_MAX ((long) ~((unsigned long)1 << (CHAR_BIT * sizeof (long) - 1)))
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX ((long long) ~((unsigned long long)1 << (CHAR_BIT * sizeof (long long) - 1)))
-#endif
+/* From gnulib, simplified to assume a signed type. */
+#define TYPE_MAXIMUM(t) ((t) (~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
 
 /* These are defined in cmpt.c if missing, so we must declare
    them.  */
@@ -131,6 +126,13 @@ int strncasecmp ();
 #ifndef HAVE_STRPTIME
 char *strptime ();
 #endif
+#ifndef HAVE_TIMEGM
+# include <time.h>
+time_t timegm (struct tm *);
+#endif
+#ifndef HAVE_MEMRCHR
+void *memrchr (const void *, int, size_t);
+#endif
 
 /* These are defined in snprintf.c.  It would be nice to have an
    snprintf.h, though.  */
@@ -151,19 +153,12 @@ int vsnprintf ();
 # define MAP_FAILED ((void *) -1)
 #endif
 
-/* Enable system fnmatch only on systems where fnmatch.h is usable and
-   which are known to have a non-broken fnmatch implementation.
-   Currently those include glibc-based systems and Solaris.  One could
-   add more, but fnmatch is not that large, so it might be better to
-   play it safe.  */
+/* Enable system fnmatch only on systems where fnmatch.h is usable.
+   If the fnmatch on your system is buggy, undef this symbol and a
+   replacement implementation will be used instead.  */
 #ifdef HAVE_WORKING_FNMATCH_H
-# if defined __GLIBC__ && __GLIBC__ >= 2
-#  define SYSTEM_FNMATCH
-# endif
-# ifdef solaris
-#  define SYSTEM_FNMATCH
-# endif
-#endif /* HAVE_WORKING_FNMATCH_H */
+# define SYSTEM_FNMATCH
+#endif
 
 #ifdef SYSTEM_FNMATCH
 # include <fnmatch.h>
@@ -180,8 +175,7 @@ int vsnprintf ();
 # define FNM_PERIOD    (1 << 2) /* Leading `.' is matched only explicitly.  */
 # define FNM_NOMATCH   1
 
-/* Declare the function minimally. */
-int fnmatch ();
+int fnmatch (const char *, const char *, int);
 #endif
 
 /* Provide sig_atomic_t if the system doesn't.  */
@@ -211,4 +205,14 @@ typedef unsigned short uint32_t;
 # endif
 #endif
 
+/* If uintptr_t isn't defined, simply typedef it to unsigned long. */
+#ifndef HAVE_UINTPTR_T
+typedef unsigned long uintptr_t;
+#endif
+
+/* If intptr_t isn't defined, simply typedef it to long. */
+#ifndef HAVE_INTPTR_T
+typedef long intptr_t;
+#endif
+
 #endif /* SYSDEP_H */