comparison: libidn/libidn.patch
libidn/libidn.patch
- changeset 701
- 86ba9e0b19e2
equal
deleted
inserted
replaced
| -1:000000000000 | 0:1f03374b9830 |
|---|---|
| 1 Index: configure | |
| 2 --- configure.orig 2012-05-23 10:36:44.000000000 +0200 | |
| 3 +++ configure 2012-05-29 09:37:30.000000000 +0200 | |
| 4 @@ -4984,10 +4984,7 @@ | |
| 5 if $ac_preproc_ok; then : | |
| 6 | |
| 7 else | |
| 8 - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | |
| 9 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | |
| 10 -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check | |
| 11 -See \`config.log' for more details" "$LINENO" 5; } | |
| 12 + : | |
| 13 fi | |
| 14 | |
| 15 ac_ext=c | |
| 16 Index: contrib/doxygen/Doxyfile | |
| 17 Index: gl/error.c | |
| 18 --- gl/error.c.orig 2012-04-27 10:18:42.000000000 +0200 | |
| 19 +++ gl/error.c 2012-05-29 09:37:03.000000000 +0200 | |
| 20 @@ -28,7 +28,7 @@ | |
| 21 #include <stdlib.h> | |
| 22 #include <string.h> | |
| 23 | |
| 24 -#if !_LIBC && ENABLE_NLS | |
| 25 +#if !_LIBC && defined(ENABLE_NLS) | |
| 26 # include "gettext.h" | |
| 27 # define _(msgid) gettext (msgid) | |
| 28 #endif | |
| 29 Index: gl/gettext.h | |
| 30 --- gl/gettext.h.orig 2012-04-27 10:18:42.000000000 +0200 | |
| 31 +++ gl/gettext.h 2012-05-29 09:37:03.000000000 +0200 | |
| 32 @@ -19,7 +19,7 @@ | |
| 33 #define _LIBGETTEXT_H 1 | |
| 34 | |
| 35 /* NLS can be disabled through the configure --disable-nls option. */ | |
| 36 -#if ENABLE_NLS | |
| 37 +#ifdef ENABLE_NLS | |
| 38 | |
| 39 /* Get declarations of GNU message catalog functions. */ | |
| 40 # include <libintl.h> | |
| 41 Index: lib/gl/gettext.h | |
| 42 --- lib/gl/gettext.h.orig 2012-04-27 10:18:42.000000000 +0200 | |
| 43 +++ lib/gl/gettext.h 2012-05-29 09:37:03.000000000 +0200 | |
| 44 @@ -19,7 +19,7 @@ | |
| 45 #define _LIBGETTEXT_H 1 | |
| 46 | |
| 47 /* NLS can be disabled through the configure --disable-nls option. */ | |
| 48 -#if ENABLE_NLS | |
| 49 +#ifdef ENABLE_NLS | |
| 50 | |
| 51 /* Get declarations of GNU message catalog functions. */ | |
| 52 # include <libintl.h> | |
| 53 Index: lib/gl/stdint.in.h | |
| 54 --- lib/gl/stdint.in.h.orig 2012-05-22 19:55:38.000000000 +0200 | |
| 55 +++ lib/gl/stdint.in.h 2012-05-29 09:37:03.000000000 +0200 | |
| 56 @@ -105,7 +105,7 @@ | |
| 57 # include <sys/inttypes.h> | |
| 58 #endif | |
| 59 | |
| 60 -#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ | |
| 61 +#if (@HAVE_SYS_BITYPES_H@ + 0) && ! defined __BIT_TYPES_DEFINED__ | |
| 62 /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines | |
| 63 int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is | |
| 64 included by <sys/types.h>. */ | |
| 65 @@ -535,7 +535,7 @@ | |
| 66 # define SIZE_MAX _STDINT_MAX (0, 32, 0ul) | |
| 67 # endif | |
| 68 #else | |
| 69 -# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) | |
| 70 +# define SIZE_MAX _STDINT_MAX (0, sizeof(size_t)*8, 0@SIZE_T_SUFFIX@) | |
| 71 #endif | |
| 72 | |
| 73 /* wchar_t limits */ | |
| 74 Index: lib/stringprep.c | |
| 75 --- lib/stringprep.c.orig 2012-04-27 12:48:08.000000000 +0200 | |
| 76 +++ lib/stringprep.c 2012-05-29 09:37:03.000000000 +0200 | |
| 77 @@ -33,6 +33,14 @@ | |
| 78 | |
| 79 #include <stdlib.h> | |
| 80 #include <string.h> | |
| 81 +#include <limits.h> | |
| 82 + | |
| 83 +#undef size_t | |
| 84 +#if 0 | |
| 85 +#ifndef SIZE_MAX | |
| 86 +#define SIZE_MAX ((((size_t)1)<<(sizeof(size_t)*8))-1) | |
| 87 +#endif | |
| 88 +#endif | |
| 89 | |
| 90 #include "stringprep.h" | |
| 91 |
