mirror of
https://gitdl.cn/https://github.com/chakralinux/lib32.git
synced 2025-01-24 01:42:15 +08:00
88 lines
4.0 KiB
Diff
88 lines
4.0 KiB
Diff
|
diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am
|
||
|
|
--- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 2011-11-09 16:32:47.000000000 +0100
|
||
|
|
+++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am 2011-12-21 12:50:19.000000000 +0100
|
||
|
|
@@ -438,7 +438,6 @@ javascriptcore_sources += \
|
||
|
|
Source/JavaScriptCore/wtf/gobject/GRefPtr.h \
|
||
|
|
Source/JavaScriptCore/wtf/gobject/GTypedefs.h \
|
||
|
|
Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
|
||
|
|
- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
|
||
|
|
Source/JavaScriptCore/wtf/HashCountedSet.h \
|
||
|
|
Source/JavaScriptCore/wtf/HashFunctions.h \
|
||
|
|
Source/JavaScriptCore/wtf/HashIterators.h \
|
||
|
|
diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
|
||
|
|
--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 2011-11-09 16:32:47.000000000 +0100
|
||
|
|
+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp 2011-12-21 12:50:19.000000000 +0100
|
||
|
|
@@ -37,18 +37,6 @@ template <> void freeOwnedGPtr<GList>(GL
|
||
|
|
g_list_free(ptr);
|
||
|
|
}
|
||
|
|
|
||
|
|
-template <> void freeOwnedGPtr<GCond>(GCond* ptr)
|
||
|
|
-{
|
||
|
|
- if (ptr)
|
||
|
|
- g_cond_free(ptr);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-template <> void freeOwnedGPtr<GMutex>(GMutex* ptr)
|
||
|
|
-{
|
||
|
|
- if (ptr)
|
||
|
|
- g_mutex_free(ptr);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr)
|
||
|
|
{
|
||
|
|
if (ptr)
|
||
|
|
diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
|
||
|
|
--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 2011-11-09 16:32:47.000000000 +0100
|
||
|
|
+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2011-12-21 12:50:19.000000000 +0100
|
||
|
|
@@ -35,8 +35,6 @@ namespace WTF {
|
||
|
|
template <typename T> inline void freeOwnedGPtr(T* ptr);
|
||
|
|
template<> void freeOwnedGPtr<GError>(GError*);
|
||
|
|
template<> void freeOwnedGPtr<GList>(GList*);
|
||
|
|
-template<> void freeOwnedGPtr<GCond>(GCond*);
|
||
|
|
-template<> void freeOwnedGPtr<GMutex>(GMutex*);
|
||
|
|
template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
|
||
|
|
template<> void freeOwnedGPtr<GDir>(GDir*);
|
||
|
|
|
||
|
|
diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
|
||
|
|
--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 2011-11-09 16:32:47.000000000 +0100
|
||
|
|
+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-12-21 12:50:19.000000000 +0100
|
||
|
|
@@ -39,7 +39,6 @@ typedef void* gpointer;
|
||
|
|
typedef struct _GAsyncResult GAsyncResult;
|
||
|
|
typedef struct _GCancellable GCancellable;
|
||
|
|
typedef struct _GCharsetConverter GCharsetConverter;
|
||
|
|
-typedef struct _GCond GCond;
|
||
|
|
typedef struct _GDir GDir;
|
||
|
|
typedef struct _GdkAtom* GdkAtom;
|
||
|
|
typedef struct _GdkCursor GdkCursor;
|
||
|
|
@@ -52,7 +51,6 @@ typedef struct _GFile GFile;
|
||
|
|
typedef struct _GHashTable GHashTable;
|
||
|
|
typedef struct _GInputStream GInputStream;
|
||
|
|
typedef struct _GList GList;
|
||
|
|
-typedef struct _GMutex GMutex;
|
||
|
|
typedef struct _GPatternSpec GPatternSpec;
|
||
|
|
typedef struct _GPollableOutputStream GPollableOutputStream;
|
||
|
|
typedef struct _GSocketClient GSocketClient;
|
||
|
|
diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
|
||
|
|
--- webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 2011-11-09 16:32:47.000000000 +0100
|
||
|
|
+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h 2011-12-21 12:50:19.000000000 +0100
|
||
|
|
@@ -44,8 +44,6 @@
|
||
|
|
|
||
|
|
#if USE(PTHREADS)
|
||
|
|
#include <pthread.h>
|
||
|
|
-#elif PLATFORM(GTK)
|
||
|
|
-#include "GOwnPtr.h"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if PLATFORM(QT)
|
||
|
|
@@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWri
|
||
|
|
typedef void* PlatformReadWriteLock;
|
||
|
|
#endif
|
||
|
|
typedef pthread_cond_t PlatformCondition;
|
||
|
|
-#elif PLATFORM(GTK)
|
||
|
|
-typedef GOwnPtr<GMutex> PlatformMutex;
|
||
|
|
-typedef void* PlatformReadWriteLock; // FIXME: Implement.
|
||
|
|
-typedef GOwnPtr<GCond> PlatformCondition;
|
||
|
|
#elif PLATFORM(QT)
|
||
|
|
typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;
|
||
|
|
typedef void* PlatformReadWriteLock; // FIXME: Implement.
|
||
|
|
|