30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
Upstream-Status: Pending
|
|
|
|
This patch fixes the type mismatch fixing this compile issue:
|
|
|
|
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
|
|
| In file included from ./wtf/Platform.h:1217:0,
|
|
| from ./config.h:30,
|
|
| from wtf/gobject/GOwnPtr.cpp:19:
|
|
| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here
|
|
NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
|
|
|
|
|
|
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
|
2012/04/30
|
|
|
|
|
|
Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
|
|
===================================================================
|
|
--- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
|
|
+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
|
|
@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
|
|
typedef struct _GHashTable GHashTable;
|
|
typedef struct _GInputStream GInputStream;
|
|
typedef struct _GList GList;
|
|
-typedef struct _GMutex GMutex;
|
|
+typedef union _GMutex GMutex;
|
|
typedef struct _GPatternSpec GPatternSpec;
|
|
typedef struct _GPollableOutputStream GPollableOutputStream;
|
|
typedef struct _GSocketClient GSocketClient;
|