Changeset 97269 in webkit


Ignore:
Timestamp:
Oct 12, 2011 9:55:24 AM (13 years ago)
Author:
kov@webkit.org
Message:

Fix build with GLib 2.31
​https://bugs.webkit.org/show_bug.cgi?id=69840

Patch by Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk> on 2011-10-12
Reviewed by Martin Robinson.

.:

  • configure.ac: add check for pthread rwlock support.

Source/JavaScriptCore:

  • GNUmakefile.list.am: removed ThreadingGtk.cpp.
  • wtf/ThreadingPrimitives.h: remove GTK+-specific definitions.
  • wtf/gobject/GOwnPtr.cpp: remove GCond and GMutex specializations.
  • wtf/gobject/GOwnPtr.h: ditto.
  • wtf/gobject/GTypedefs.h: remove GCond and GMutex forward declarations.
  • wtf/gtk/ThreadingGtk.cpp: Removed.
Location:
trunk
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r97226 r97269  
     12011-10-12  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
     2
     3        Fix build with GLib 2.31
     4        https://bugs.webkit.org/show_bug.cgi?id=69840
     5
     6        Reviewed by Martin Robinson.
     7
     8        * configure.ac: add check for pthread rwlock support.
     9
    1102011-10-10  Martin Robinson  <mrobinson@igalia.com>
    211

  • trunk/Source/JavaScriptCore/ChangeLog

    r97240 r97269  
     12011-10-12  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
     2
     3        Fix build with GLib 2.31
     4        https://bugs.webkit.org/show_bug.cgi?id=69840
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.list.am: removed ThreadingGtk.cpp.
     9        * wtf/ThreadingPrimitives.h: remove GTK+-specific definitions.
     10        * wtf/gobject/GOwnPtr.cpp: remove GCond and GMutex specializations.
     11        * wtf/gobject/GOwnPtr.h: ditto.
     12        * wtf/gobject/GTypedefs.h: remove GCond and GMutex forward declarations.
     13        * wtf/gtk/ThreadingGtk.cpp: Removed.
     14
    1152011-10-12  Filip Pizlo  <fpizlo@apple.com>
    216

  • trunk/Source/JavaScriptCore/GNUmakefile.list.am

    r97218 r97269  
    539539        Source/JavaScriptCore/wtf/gobject/GTypedefs.h \
    540540        Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
    541         Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
    542541        Source/JavaScriptCore/wtf/HashCountedSet.h \
    543542        Source/JavaScriptCore/wtf/HashFunctions.h \

  • trunk/Source/JavaScriptCore/wtf/ThreadingPrimitives.h

    r76975 r97269  
    4545#if USE(PTHREADS)
    4646#include <pthread.h>
    47 #elif PLATFORM(GTK)
    48 #include "GOwnPtr.h"
    4947#endif
    5048
    … …  
    6765#endif
    6866typedef pthread_cond_t PlatformCondition;
    69 #elif PLATFORM(GTK)
    70 typedef GOwnPtr<GMutex> PlatformMutex;
    71 typedef void* PlatformReadWriteLock; // FIXME: Implement.
    72 typedef GOwnPtr<GCond> PlatformCondition;
    7367#elif PLATFORM(QT)
    7468typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;

  • trunk/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp

    r95901 r97269  
    3838}
    3939
    40 template <> void freeOwnedGPtr<GCond>(GCond* ptr)
    41 {
    42     if (ptr)
    43         g_cond_free(ptr);
    44 }
    45 
    46 template <> void freeOwnedGPtr<GMutex>(GMutex* ptr)
    47 {
    48     if (ptr)
    49         g_mutex_free(ptr);
    50 }
    51 
    5240template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr)
    5341{

  • trunk/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h

    r95901 r97269  
    3636template<> void freeOwnedGPtr<GError>(GError*);
    3737template<> void freeOwnedGPtr<GList>(GList*);
    38 template<> void freeOwnedGPtr<GCond>(GCond*);
    39 template<> void freeOwnedGPtr<GMutex>(GMutex*);
    4038template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
    4139template<> void freeOwnedGPtr<GDir>(GDir*);

  • trunk/Source/JavaScriptCore/wtf/gobject/GTypedefs.h

    r95901 r97269  
    4040typedef struct _GCancellable GCancellable;
    4141typedef struct _GCharsetConverter GCharsetConverter;
    42 typedef struct _GCond GCond;
    4342typedef struct _GDir GDir;
    4443typedef struct _GdkAtom* GdkAtom;
    … …  
    5352typedef struct _GInputStream GInputStream;
    5453typedef struct _GList GList;
    55 typedef struct _GMutex GMutex;
    5654typedef struct _GPatternSpec GPatternSpec;
    5755typedef struct _GPollableOutputStream GPollableOutputStream;

  • trunk/configure.ac

    r96808 r97269  
    112112                 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
    113113                 AC_MSG_ERROR([pthread support is required to build WebKit]))
     114AC_CHECK_LIB(pthread, pthread_rwlock_init,
     115                 AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]),
     116                 AC_MSG_WARN([pthread rwlock support is not available]))
    114117fi
    115118
Note: See TracChangeset for help on using the changeset viewer.