diff options
25 files changed, 74 insertions, 22 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp index ffef909520..b3db8282e1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp @@ -13,7 +13,9 @@ #include "xpcom_structs.h" #include "xpcom_stats.h" +#ifndef XPCOM_NATIVE #define XPCOM_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOM_##func +#endif #if (!defined(NO__1Call__I) && !defined(JNI64)) || (!defined(NO__1Call__J) && defined(JNI64)) #ifndef JNI64 diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp index ac77109f5a..8d5dee49f6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "xpcominit_structs.h" #include "xpcominit_stats.h" +#ifndef XPCOMInit_NATIVE #define XPCOMInit_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_init_XPCOMInit_##func +#endif #ifndef NO_GREProperty_1sizeof extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREProperty_1sizeof)(JNIEnv *env, jclass that); diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.c index 600b28e77e..1ec2523157 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.c +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "agl_structs.h" #include "agl_stats.h" +#ifndef AGL_NATIVE #define AGL_NATIVE(func) Java_org_eclipse_swt_internal_opengl_carbon_AGL_##func +#endif #ifndef NO_aglChoosePixelFormat JNIEXPORT jint JNICALL AGL_NATIVE(aglChoosePixelFormat) diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c index 7adc742281..80e4ef268b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "glx_structs.h" #include "glx_stats.h" +#ifndef GLX_NATIVE #define GLX_NATIVE(func) Java_org_eclipse_swt_internal_opengl_glx_GLX_##func +#endif #ifndef NO_XVisualInfo_1sizeof JNIEXPORT jint JNICALL GLX_NATIVE(XVisualInfo_1sizeof) diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c index 85eed92707..77a87cc421 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "wgl_structs.h" #include "wgl_stats.h" +#ifndef WGL_NATIVE #define WGL_NATIVE(func) Java_org_eclipse_swt_internal_opengl_win32_WGL_##func +#endif #ifndef NO_ChoosePixelFormat JNIEXPORT jint JNICALL WGL_NATIVE(ChoosePixelFormat) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c index dc65b249e9..72220cf07f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c @@ -23,7 +23,9 @@ #include "cairo_structs.h" #include "cairo_stats.h" +#ifndef Cairo_NATIVE #define Cairo_NATIVE(func) Java_org_eclipse_swt_internal_cairo_Cairo_##func +#endif #ifndef NO_CAIRO_1VERSION_1ENCODE JNIEXPORT jint JNICALL Cairo_NATIVE(CAIRO_1VERSION_1ENCODE) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c index 6bfd7e24cb..8b3b70a81e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c @@ -13,7 +13,9 @@ #include "cocoa_structs.h" #include "cocoa_stats.h" +#ifndef Cocoa_NATIVE #define Cocoa_NATIVE(func) Java_org_eclipse_swt_internal_cocoa_Cocoa_##func +#endif #ifndef NO_HICocoaViewCreate JNIEXPORT jint JNICALL Cocoa_NATIVE(HICocoaViewCreate) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c index c824f03483..2feb719e12 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "os_structs.h" #include "os_stats.h" +#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_carbon_OS_##func +#endif #ifndef NO_AECoerceDesc JNIEXPORT jint JNICALL OS_NATIVE(AECoerceDesc) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c index 575c44182a..be188f37e4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c @@ -13,7 +13,9 @@ #include "os_structs.h" #include "os_stats.h" +#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_cocoa_OS_##func +#endif #ifndef NO_ATSFontActivateFromFileReference JNIEXPORT jint JNICALL OS_NATIVE(ATSFontActivateFromFileReference) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c index 15cfa51e6d..acbfca0145 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "c_structs.h" #include "c_stats.h" +#ifndef C_NATIVE #define C_NATIVE(func) Java_org_eclipse_swt_internal_C_##func +#endif #ifndef NO_PTR_1sizeof JNIEXPORT jint JNICALL C_NATIVE(PTR_1sizeof) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c index f542499df4..34a5351e9a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -17,7 +17,9 @@ #include "atk_structs.h" #include "atk_stats.h" +#ifndef ATK_NATIVE #define ATK_NATIVE(func) Java_org_eclipse_swt_internal_accessibility_gtk_ATK_##func +#endif #ifndef NO_ATK_1IS_1NO_1OP_1OBJECT_1FACTORY JNIEXPORT jboolean JNICALL ATK_NATIVE(ATK_1IS_1NO_1OP_1OBJECT_1FACTORY) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 952450fa0a..53b22d110d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -17,7 +17,9 @@ #include "os_structs.h" #include "os_stats.h" +#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func +#endif #if (!defined(NO_Call__IIII) && !defined(JNI64)) || (!defined(NO_Call__JJII) && defined(JNI64)) #ifndef JNI64 diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c index 2dfdb94f2a..70117c6075 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "os_structs.h" #include "os_stats.h" +#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_motif_OS_##func +#endif #ifndef NO_CODESET JNIEXPORT jint JNICALL OS_NATIVE(CODESET) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/gtk.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/gtk.c index d20c41b2b0..42cfc288a0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/gtk.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/gtk.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -17,7 +17,9 @@ #include "gtk_structs.h" #include "gtk_stats.h" +#ifndef GTK_NATIVE #define GTK_NATIVE(func) Java_org_eclipse_swt_internal_gtk_GTK_##func +#endif #ifndef NO__1GTK_1WIDGET_1HEIGHT JNIEXPORT jint JNICALL GTK_NATIVE(_1GTK_1WIDGET_1HEIGHT) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c index 2a3e354eb1..b232a23948 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "os_structs.h" #include "os_stats.h" +#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_photon_OS_##func +#endif #ifndef NO_PfDecomposeStemToID JNIEXPORT jint JNICALL OS_NATIVE(PfDecomposeStemToID) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c index 39de3e9706..b92344aff9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "com_structs.h" #include "com_stats.h" +#ifndef COM_NATIVE #define COM_NATIVE(func) Java_org_eclipse_swt_internal_ole_win32_COM_##func +#endif #ifndef NO_AccessibleChildren JNIEXPORT jint JNICALL COM_NATIVE(AccessibleChildren) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp index b9d72c9e7b..1a8efee3dd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "gdip_structs.h" #include "gdip_stats.h" +#ifndef Gdip_NATIVE #define Gdip_NATIVE(func) Java_org_eclipse_swt_internal_gdip_Gdip_##func +#endif #ifndef NO_BitmapData_1delete extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)(JNIEnv *env, jclass that, jintLong arg0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c index 9c5c684d0d..c536fa81dc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c @@ -13,7 +13,9 @@ #include "os_structs.h" #include "os_stats.h" +#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_win32_OS_##func +#endif #ifndef NO_ACCEL_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(ACCEL_1sizeof) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp index f0d15cc66f..8c26257793 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "os_structs.h" #include "os_stats.h" +#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_wpf_OS_##func +#endif #ifndef NO_AccessText_1AccessKey extern "C" JNIEXPORT jchar JNICALL OS_NATIVE(AccessText_1AccessKey)(JNIEnv *env, jclass that, jint arg0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32.c b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32.c index 54cfe03c00..06796a84cd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "win32_structs.h" #include "win32_stats.h" +#ifndef Win32_NATIVE #define Win32_NATIVE(func) Java_org_eclipse_swt_internal_win32_Win32_##func +#endif #ifndef NO_CloseHandle JNIEXPORT jboolean JNICALL Win32_NATIVE(CloseHandle) diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde.c b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde.c index 0840e83c41..6958b3c3a2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde.c +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "cde_structs.h" #include "cde_stats.h" +#ifndef CDE_NATIVE #define CDE_NATIVE(func) Java_org_eclipse_swt_internal_cde_CDE_##func +#endif #ifndef NO_DtActionArg_1sizeof JNIEXPORT jint JNICALL CDE_NATIVE(DtActionArg_1sizeof) diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c index 276ffef2b6..be0abfc537 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -17,7 +17,9 @@ #include "gnome_structs.h" #include "gnome_stats.h" +#ifndef GNOME_NATIVE #define GNOME_NATIVE(func) Java_org_eclipse_swt_internal_gnome_GNOME_##func +#endif #ifndef NO_GnomeVFSMimeApplication_1sizeof JNIEXPORT jint JNICALL GNOME_NATIVE(GnomeVFSMimeApplication_1sizeof) diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c index a9dbb96488..0d8b934041 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c @@ -17,7 +17,9 @@ #include "webkitgtk_structs.h" #include "webkitgtk_stats.h" +#ifndef WebKitGTK_NATIVE #define WebKitGTK_NATIVE(func) Java_org_eclipse_swt_internal_webkit_WebKitGTK_##func +#endif #ifndef NO_JSClassDefinition_1sizeof JNIEXPORT jint JNICALL WebKitGTK_NATIVE(JSClassDefinition_1sizeof) diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp index 443ac1ba82..e0250ad096 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.cpp @@ -17,7 +17,9 @@ #include "webkit_win32_structs.h" #include "webkit_win32_stats.h" +#ifndef WebKit_win32_NATIVE #define WebKit_win32_NATIVE(func) Java_org_eclipse_swt_internal_webkit_WebKit_1win32_##func +#endif #ifndef NO_CFArrayGetCount extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(CFArrayGetCount)(JNIEnv *env, jclass that, jintLong arg0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c index 73d9851dbb..8b4d65c0cd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c @@ -15,6 +15,10 @@ #include "callback.h" #include <string.h> +#ifndef CALLBACK_NATIVE +#define CALLBACK_NATIVE(func) Java_org_eclipse_swt_internal_Callback_##func +#endif + /* define this to print out debug statements */ /* #define DEBUG_CALL_PRINTS */ @@ -979,7 +983,7 @@ jintLong fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = { /* --------------- callback class calls --------------- */ -JNIEXPORT jintLong JNICALL Java_org_eclipse_swt_internal_Callback_bind +JNIEXPORT jintLong JNICALL CALLBACK_NATIVE(bind) (JNIEnv *env, jclass that, jobject callbackObject, jobject object, jstring method, jstring signature, jint argCount, jboolean isStatic, jboolean isArrayBased, jintLong errorResult) { int i; @@ -1119,7 +1123,7 @@ fail: return 0; } -JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_unbind +JNIEXPORT void JNICALL CALLBACK_NATIVE(unbind) (JNIEnv *env, jclass that, jobject callback) { int i; @@ -1132,25 +1136,25 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_unbind } } -JNIEXPORT jboolean JNICALL Java_org_eclipse_swt_internal_Callback_getEnabled +JNIEXPORT jboolean JNICALL CALLBACK_NATIVE(getEnabled) (JNIEnv *env, jclass that) { return (jboolean)callbackEnabled; } -JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_Callback_getEntryCount +JNIEXPORT jint JNICALL CALLBACK_NATIVE(getEntryCount) (JNIEnv *env, jclass that) { return (jint)callbackEntryCount; } -JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_setEnabled +JNIEXPORT void JNICALL CALLBACK_NATIVE(setEnabled) (JNIEnv *env, jclass that, jboolean enable) { callbackEnabled = enable; } -JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_reset +JNIEXPORT void JNICALL CALLBACK_NATIVE(reset) (JNIEnv *env, jclass that) { memset((void *)&callbackData, 0, sizeof(callbackData)); |