diff options
| author | Sravan Kumar Lakkimsetti | 2015-06-02 10:15:57 +0000 |
|---|---|---|
| committer | Arun Thondapu | 2015-06-02 11:54:39 +0000 |
| commit | d1b0979fd88855a1ec0374991bdaa92034c6a18e (patch) | |
| tree | fdce58c487f09bf10292499a1ac539a75b7e3831 | |
| parent | de33ef396e75ac75286d4ba816bc277807c0b427 (diff) | |
| download | rt.equinox.framework-d1b0979fd88855a1ec0374991bdaa92034c6a18e.tar.gz rt.equinox.framework-d1b0979fd88855a1ec0374991bdaa92034c6a18e.tar.xz rt.equinox.framework-d1b0979fd88855a1ec0374991bdaa92034c6a18e.zip | |
Bug 469113 - Enable GTK3 for GTK < 3.10.9 as well on ppc64le platform
reverted the version check for ppc64le
Change-Id: I8d54479e20bbd69ab9cc8ea5f5b7a7ea4062cc16
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c | 22 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak | 1 |
2 files changed, 0 insertions, 23 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c index 9c937f315..8abe5d615 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c @@ -26,11 +26,6 @@ static _TCHAR* upgradeWarning2 = _T_ECLIPSE("\nor use an older version of Eclips static int minGtkMajorVersion = 2; static int minGtkMinorVersion = 18; static int minGtkMicroVersion = 0; -#ifdef __ppc64le__ -static int minGtk3MajorVersion = 3; -static int minGtk3MinorVersion = 10; -static int minGtk3MicroVersion = 9; -#endif /* tables to help initialize the function pointers */ /* functions from libgtk-x11-2.0 or libgtk-3.so.0*/ @@ -136,23 +131,6 @@ int loadGtk() { if (gdkCoreDeviceEvents == NULL) { setenv("GDK_CORE_DEVICE_EVENTS", "1", 0); } -#ifdef __ppc64le__ - /* Adding a temporary version check for GTK3 till we verify with lower versions of GTK3 */ - if (gtkLib != NULL) { - const char * (*func)(int, int, int); - dlerror(); - *(void**) (&func) = dlsym(gtkLib, "gtk_check_version"); - if (dlerror() == NULL && func) { - const char *check = (*func)(minGtk3MajorVersion, minGtk3MinorVersion, minGtk3MicroVersion); - if ((check != NULL) && (gtk3 == NULL)) { - dlclose(gdkLib); - dlclose(gtkLib); - gdkLib = gtkLib = NULL; - } - } - } -#endif - } if (!gtkLib || !gdkLib) { //if GTK+ 2 gdkLib = dlopen(GDK_LIB, DLFLAGS); diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak index 0bf14ffbf..6abe01702 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak @@ -52,7 +52,6 @@ CFLAGS = ${M_ARCH} -g -s -Wall\ -fpic \ -DLINUX \ -DMOZILLA_FIX \ - -D__$(DEFAULT_OS_ARCH)__ \ -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ -DDEFAULT_WS="\"$(DEFAULT_WS)\"" \ |