[vlc-devel] commit: contribs: fixed glib patch for Darwin 64bit compilation ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Aug 31 02:14:21 2009 +0200| [e123d847f6ce7789d6d69306e0265f0d74bb6bdf] | committer: Felix Paul Kühne 

contribs: fixed glib patch for Darwin 64bit compilation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e123d847f6ce7789d6d69306e0265f0d74bb6bdf
---

 extras/contrib/src/Patches/glib-Darwin64.patch |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/extras/contrib/src/Patches/glib-Darwin64.patch b/extras/contrib/src/Patches/glib-Darwin64.patch
index aa3314e..59131d2 100644
--- a/extras/contrib/src/Patches/glib-Darwin64.patch
+++ b/extras/contrib/src/Patches/glib-Darwin64.patch
@@ -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