X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fsysdep.h;h=98b3c13bd8c6d1a0f5e3e725348e264099e59693;hp=8c3a9a86370b792a89f150a135ab9832bed27bd2;hb=4d7c5e087b2bc82c9f503dff003916d1047903ce;hpb=cb2cc3abf8bbf7fa135bf4a6a96a748b89cef2be
diff --git a/src/sysdep.h b/src/sysdep.h
index 8c3a9a86..98b3c13b 100644
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,11 +1,11 @@
/* 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.
GNU Wget is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
+the Free Software Foundation; either version 3 of the License, or (at
your option) any later version.
GNU Wget is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@ 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, see .
In addition, as a special exception, the Free Software Foundation
gives permission to link the code of its release of Wget with the
@@ -44,12 +43,12 @@ so, delete this exception statement from your version. */
#ifdef WINDOWS
/* Windows doesn't have some functions normally found on Unix-like
- systems, such as strcasecmp, strptime, strpbrk, etc. Include
- mswindows.h so we get the declarations for their replacements in
- mswindows.c, as 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
+ systems, such as strcasecmp, strptime, etc. Include mswindows.h so
+ we get the declarations for their replacements in mswindows.c, as
+ 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"
#endif
/* Provide support for C99-type boolean type "bool". This blurb comes
@@ -96,35 +95,6 @@ typedef unsigned char _Bool;
# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
#endif
-/* Define a large integral type useful for storing large sizes that
- exceed sizes of one download, such as when printing the sum of all
- downloads. Note that this has nothing to do with large file
- support, which determines the wgint type. This should be as large
- as possible even on systems where when wgint is 32-bit; also,
- unlike wgint, this can be a floating point type.
-
- We use a 64-bit integral type where available, `double' otherwise.
- It's hard to print LARGE_INT's portably, but fortunately it's
- rarely needed. */
-
-#if SIZEOF_LONG >= 8
-/* Long is large enough: use it. */
-typedef long LARGE_INT;
-# define LARGE_INT_FMT "%ld"
-#elif SIZEOF_LONG_LONG >= 8
-/* Long long is large enough: use it. */
-typedef long long LARGE_INT;
-# define LARGE_INT_FMT "%lld"
-#elif WINDOWS
-/* Use __int64 under Windows. */
-typedef __int64 LARGE_INT;
-# define LARGE_INT_FMT "%I64"
-#else
-/* Large integer type unavailable; fake it with `double'. */
-typedef double LARGE_INT;
-# define LARGE_INT_FMT "%.0f"
-#endif
-
/* These are needed so we can #define struct_stat to struct _stati64
under Windows. */
#ifndef struct_stat
@@ -141,13 +111,8 @@ typedef double LARGE_INT;
# 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. */
@@ -160,6 +125,13 @@ int strncasecmp ();
#ifndef HAVE_STRPTIME
char *strptime ();
#endif
+#ifndef HAVE_TIMEGM
+# include
+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. */
@@ -180,19 +152,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
@@ -209,8 +174,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. */
@@ -240,4 +204,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 */