diff options
Diffstat (limited to 'editors/openoffice.org-2.0/files/patch-i66667')
| -rw-r--r-- | editors/openoffice.org-2.0/files/patch-i66667 | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/editors/openoffice.org-2.0/files/patch-i66667 b/editors/openoffice.org-2.0/files/patch-i66667 index 6e3a697c4bf0..411c38f84a7f 100644 --- a/editors/openoffice.org-2.0/files/patch-i66667 +++ b/editors/openoffice.org-2.0/files/patch-i66667 @@ -1,10 +1,10 @@ -Index: gtkinst.cxx +Index: vcl/unx/gtk/app/gtkinst.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v -retrieving revision 1.13 -diff -u -r1.13 gtkinst.cxx ---- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13 -+++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000 +retrieving revision 1.14.88.1 +diff -u -r1.14.88.1 gtkinst.cxx +--- vcl/unx/gtk/app/gtkinst.cxx 10 Aug 2006 14:53:08 -0000 1.14.88.1 ++++ vcl/unx/gtk/app/gtkinst.cxx 19 Aug 2006 11:13:07 -0000 @@ -43,6 +43,7 @@ #include <plugins/gtk/atkbridge.hxx> @@ -13,15 +13,14 @@ diff -u -r1.13 gtkinst.cxx #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> -@@ -111,13 +112,28 @@ +@@ -111,11 +112,26 @@ GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX(); pYieldMutex->ThreadsLeave(); } - static bool hookLocks( oslModule pModule ) + static bool hookLocks( void ) { -- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn); -+ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn ); + typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn); rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") ); + /* XXX GDK library path should be set by configure. */ @@ -40,11 +39,8 @@ diff -u -r1.13 gtkinst.cxx + } + GdkLockFn gdk_threads_set_lock_functions = -- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData ); -+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData ); + (GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData ); if ( !gdk_threads_set_lock_functions ) - { - #if OSL_DEBUG_LEVEL > 1 @@ -150,7 +166,7 @@ if ( !g_thread_supported() ) g_thread_init( NULL ); |