]> git.sesse.net Git - vlc/commitdiff
contribs: fixed glib patch for Darwin 64bit compilation
authorFelix Paul Kühne <fkuehne@videolan.org>
Mon, 31 Aug 2009 00:14:21 +0000 (02:14 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Mon, 31 Aug 2009 00:14:21 +0000 (02:14 +0200)
extras/contrib/src/Patches/glib-Darwin64.patch

index aa3314ec02282efff092339c627ea26e9cf3ec94..59131d2278c2c97e7c081bba5c9b1300f5d21cf4 100644 (file)
@@ -1,12 +1,16 @@
 --- glib/gconvert.c    2009-06-27 05:18:06.000000000 +0200
-+++ glib/gconvert.c    2009-07-18 02:09:30.000000000 +0200
-@@ -51,9 +51,6 @@
- #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
- #error GNU libiconv in use but included iconv.h not from libiconv
- #endif
++++ glib/gconvert.c    2009-08-31 02:11:23.000000000 +0200
+@@ -48,13 +48,6 @@
+ #include "glibintl.h"
+-#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)
 -#error GNU libiconv not in use but included iconv.h is from libiconv
 -#endif
+-
  #include "galias.h"
  
+ GQuark