Kaydet (Commit) ffa651bd authored tarafından Michael Meeks's avatar Michael Meeks

fix embarassing mess up around gtk+ version detection.

Change-Id: I5a24235f5bb6791f64ba752b01cf185e7a7287cb
üst 694ac815
...@@ -69,9 +69,13 @@ extern "C" ...@@ -69,9 +69,13 @@ extern "C"
(int) gtk_major_version, (int) gtk_minor_version, (int) gtk_major_version, (int) gtk_minor_version,
(int) gtk_micro_version ); (int) gtk_micro_version );
#endif #endif
if( (int) gtk_major_version < 2 || ((int) gtk_major_version == 2 && (int) gtk_minor_version < 4)) if( gtk_major_version < 2 || // very unlikely sanity check
( gtk_major_version == 2 && gtk_minor_version < 4 ) )
{
g_warning("require a newer gtk than %d.%d for gdk_threads_set_lock_functions", (int) gtk_major_version, gtk_minor_version); g_warning("require a newer gtk than %d.%d for gdk_threads_set_lock_functions", (int) gtk_major_version, gtk_minor_version);
return NULL; return NULL;
}
/* #i92121# workaround deadlocks in the X11 implementation /* #i92121# workaround deadlocks in the X11 implementation
*/ */
static const char* pNoXInitThreads = getenv( "SAL_NO_XINITTHREADS" ); static const char* pNoXInitThreads = getenv( "SAL_NO_XINITTHREADS" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment