X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fsysdep.h;h=98b3c13bd8c6d1a0f5e3e725348e264099e59693;hp=7854eafafa17e65e9605f1815aecae2e7fb0672b;hb=4d7c5e087b2bc82c9f503dff003916d1047903ce;hpb=7487dbfa815f245279bde62276041b2341ed354d
diff --git a/src/sysdep.h b/src/sysdep.h
index 7854eafa..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
@@ -33,50 +32,51 @@ so, delete this exception statement from your version. */
#ifndef SYSDEP_H
#define SYSDEP_H
-/* We need these to be playing with various stuff. */
-#ifdef TIME_WITH_SYS_TIME
-# include
-# include
-#else /* not TIME_WITH_SYS_TIME_H */
-#ifdef HAVE_SYS_TIME_H
-# include
-#else /* not HAVE_SYS_TIME_H */
-# include
-#endif /* HAVE_SYS_TIME_H */
-#endif /* TIME_WITH_SYS_TIME_H */
-
+/* Must include these, so we can test for the missing stat macros and
+ define them as necessary. */
#include
#include
+#ifdef HAVE_INTTYPES_H
+# include
+#endif
+
#ifdef WINDOWS
-/* Windows doesn't have some functions. Include mswindows.h so we get
- their declarations, as well as some additional declarations and
- macros. This must come first, so it can set things up. */
-#include
-#endif /* WINDOWS */
-
-/* Watcom-specific stuff. In practice this is probably specific to
- Windows, although Watcom exists under other OS's too. For that
- reason, we keep this here. */
-
-#ifdef __WATCOMC__
-/* Watcom has its own alloca() defined in malloc.h malloc.h needs to
- be included in the sources to prevent 'undefined external' errors
- at the link phase. */
-# include
-/* io.h defines unlink() and chmod(). We put this here because it's
- way too obscure to require all the .c files to observe. */
-# include
-#endif /* __WATCOMC__ */
+/* Windows doesn't have some functions normally found on Unix-like
+ 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
+ straight from the Autoconf 2.59 manual. */
+#if HAVE_STDBOOL_H
+# 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: */
#ifdef __EMX__
-#ifndef S_ISLNK
-# define S_ISLNK(m) 0
-#endif
-#ifndef lstat
-# define lstat stat
-#endif
+# ifndef S_ISLNK
+# define S_ISLNK(m) 0
+# endif
+# ifndef lstat
+# define lstat stat
+# endif
#endif /* __EMX__ */
/* Reportedly, stat() macros are broken on some old systems. Those
@@ -84,7 +84,7 @@ so, delete this exception statement from your version. */
new code to handle it.
However, I will add code for *missing* macros, and the following
- are missing from many systems. */
+ are reportedly missing from many systems. */
#ifndef S_ISLNK
# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
#endif
@@ -95,115 +95,52 @@ so, delete this exception statement from your version. */
# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
#endif
-/* Bletch! SPARC compiler doesn't define sparc (needed by
- arpa/nameser.h) when in -Xc mode. Luckily, it always defines
- __sparc. */
-#ifdef __sparc
-#ifndef sparc
-#define sparc
+/* These are needed so we can #define struct_stat to struct _stati64
+ under Windows. */
+#ifndef struct_stat
+# define struct_stat struct stat
#endif
+#ifndef struct_fstat
+# define struct_fstat struct stat
#endif
-#ifdef __BEOS__
-# undef READ
-# undef WRITE
-# define READ(fd, buf, cnt) recv((fd), (buf), (cnt), 0)
-# define WRITE(fd, buf, cnt) send((fd), (buf), (cnt), 0)
-#endif
+/* For CHAR_BIT, LONG_MAX, etc. */
+#include
-/* mswindows.h defines these. */
-#ifndef READ
-# define READ(fd, buf, cnt) read ((fd), (buf), (cnt))
-#endif
-#ifndef WRITE
-# define WRITE(fd, buf, cnt) write ((fd), (buf), (cnt))
-#endif
-#ifndef REALCLOSE
-# define REALCLOSE(x) close (x)
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
#endif
-#define CLOSE(x) \
-do { \
- REALCLOSE (x); \
- DEBUGP (("Closing fd %d\n", x)); \
-} while (0)
-
-/* 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, yet.
-
- 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"
-#else
-# if SIZEOF_LONG_LONG == 8
-/* Long long is large enough: use it. */
-typedef long long LARGE_INT;
-# define LARGE_INT_FMT "%lld"
-# else
-/* Use `double'. */
-typedef double LARGE_INT;
-# define LARGE_INT_FMT "%.0f"
-# endif
-#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, therefore it's generally
- safe to declare their parameters. */
-#ifndef HAVE_STRERROR
-char *strerror ();
-#endif
+/* These are defined in cmpt.c if missing, so we must declare
+ them. */
#ifndef HAVE_STRCASECMP
int strcasecmp ();
#endif
#ifndef HAVE_STRNCASECMP
int strncasecmp ();
#endif
-#ifndef HAVE_STRSTR
-char *strstr ();
-#endif
#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. */
#ifndef HAVE_SNPRINTF
int snprintf ();
#endif
#ifndef HAVE_VSNPRINTF
int vsnprintf ();
#endif
-#ifndef HAVE_USLEEP
-int usleep PARAMS ((unsigned long));
-#endif
-#ifndef HAVE_MEMMOVE
-void *memmove ();
-#endif
-
-/* SunOS brain damage -- for some reason, SunOS header files fail to
- declare the functions below, which causes all kinds of problems,
- most notably compilation errors when using pointer arithmetic on
- their return values.
-
- This used to be only within `#ifdef STDC_HEADERS', but it got
- tripped on other systems (AIX), thus causing havoc. Fortunately,
- SunOS appears to be the only system braindamaged that badly, so I
- added an extra `#ifdef sun' guard. */
-#ifndef STDC_HEADERS
-#ifdef sun
-#ifndef __SVR4 /* exclude Solaris */
-char *strstr ();
-char *strchr ();
-char *strrchr ();
-char *strtok ();
-char *strdup ();
-void *memcpy ();
-#endif /* not __SVR4 */
-#endif /* sun */
-#endif /* not STDC_HEADERS */
/* Some systems (Linux libc5, "NCR MP-RAS 3.0", and others) don't
provide MAP_FAILED, a symbolic constant for the value returned by
@@ -215,14 +152,10 @@ void *memcpy ();
# define MAP_FAILED ((void *) -1)
#endif
-/* Enable system fnmatch only on systems where we know it works:
- currently glibc-based systems and Solaris. One could add more, but
- fnmatch is not that large, so it might be better to play it
- safe. */
-#if defined __GLIBC__ && __GLIBC__ >= 2
-# define SYSTEM_FNMATCH
-#endif
-#ifdef solaris
+/* 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
# define SYSTEM_FNMATCH
#endif
@@ -241,30 +174,44 @@ void *memcpy ();
# 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. */
+#ifndef HAVE_SIG_ATOMIC_T
+typedef int sig_atomic_t;
#endif
-/* Provide u_int32_t on the platforms that don't define it. Although
+/* Provide uint32_t on the platforms that don't define it. Although
most code should be agnostic about integer sizes, some code really
- does need a 32-bit integral type. Such code should use u_int32_t.
+ does need a 32-bit integral type. Such code should use uint32_t.
(The exception is gnu-md5.[ch], which uses its own detection for
portability across platforms.) */
-#ifndef HAVE_U_INT32_T
+#ifndef HAVE_UINT32_T
# if SIZEOF_INT == 4
-typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
# else
# if SIZEOF_LONG == 4
-typedef unsigned long u_int32_t;
+typedef unsigned long uint32_t;
# else
# if SIZEOF_SHORT == 4
-typedef unsigned short u_int32_t;
+typedef unsigned short uint32_t;
# else
- #error "Cannot determine a 32-bit type"
+ #error "Cannot determine a 32-bit unsigned integer type"
# endif
# endif
# 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 */