[svn] Allow 64-bit wgint without LFS.

[wget] / src / sysdep.h

diff --git a/src/sysdep.h b/src/sysdep.h
index 90d2a7c35ee1b07369372f48fda3da119f623b17..9ac67a8e0919f8d928f5514a3a16218289716525 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -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.  */
@@ -135,6 +130,9 @@ char *strptime ();
 # 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.  */
@@ -207,4 +205,9 @@ 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
+
 #endif /* SYSDEP_H */