diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-03-14 16:56:20 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-03-14 16:56:20 +0000 |
| commit | 4e58ec540f4e8b626f977aa9f0b525ddb830826b (patch) | |
| tree | cbe9f8b1e6c51827d65f396983e41e86459e386e /macosx-support-lib-patches | |
| parent | 1d4f630589e3faa1be659b8eefad9841f588036a (diff) | |
| download | wireshark-4e58ec540f4e8b626f977aa9f0b525ddb830826b.tar.gz wireshark-4e58ec540f4e8b626f977aa9f0b525ddb830826b.tar.bz2 wireshark-4e58ec540f4e8b626f977aa9f0b525ddb830826b.zip | |
Update to glib 2.31.20.
One patch is not required anymore, since it has been included.
svn path=/trunk/; revision=41546
Diffstat (limited to 'macosx-support-lib-patches')
| -rw-r--r-- | macosx-support-lib-patches/glib-gconvert.patch | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/macosx-support-lib-patches/glib-gconvert.patch b/macosx-support-lib-patches/glib-gconvert.patch deleted file mode 100644 index fb0aea73b3..0000000000 --- a/macosx-support-lib-patches/glib-gconvert.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-2.29.8/glib/gconvert.c.orig 2011-06-26 14:48:37.000000000 +0200 -+++ glib-2.29.8/glib/gconvert.c 2011-06-26 14:49:58.000000000 +0200 -@@ -61,7 +61,7 @@ - #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) - #error GNU libiconv in use but included iconv.h not from libiconv - #endif --#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) -+#if !(defined(__APPLE__) && defined(__LP64__)) && !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) - #error GNU libiconv not in use but included iconv.h is from libiconv - #endif |