diff options
| author | Felipe Heidrich <fheidric> | 2007-01-26 23:26:56 +0000 |
|---|---|---|
| committer | Felipe Heidrich <fheidric> | 2007-01-26 23:26:56 +0000 |
| commit | 6f962e3a053bd8c18a3e154a7ac0ad1ba2aeb3fe (patch) | |
| tree | 7e2a9bb6541e24eef6fe46c8231185cbb7149093 /bundles/org.eclipse.swt/Eclipse SWT OpenGL | |
| parent | 579505f5c399bb89f97d98e9912b18625d2312e2 (diff) | |
| download | eclipse.platform.swt-6f962e3a053bd8c18a3e154a7ac0ad1ba2aeb3fe.tar.gz eclipse.platform.swt-6f962e3a053bd8c18a3e154a7ac0ad1ba2aeb3fe.tar.xz eclipse.platform.swt-6f962e3a053bd8c18a3e154a7ac0ad1ba2aeb3fe.zip | |
new jni tool (support wpf)
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT OpenGL')
3 files changed, 12 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl_stats.h b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl_stats.h index e1bc04038e..cbaff2aab0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl_stats.h @@ -16,9 +16,13 @@ extern char* AGL_nativeFunctionNames[]; #define AGL_NATIVE_ENTER(env, that, func) AGL_nativeFunctionCallCount[func]++; #define AGL_NATIVE_EXIT(env, that, func) #else +#ifndef AGL_NATIVE_ENTER #define AGL_NATIVE_ENTER(env, that, func) +#endif +#ifndef AGL_NATIVE_EXIT #define AGL_NATIVE_EXIT(env, that, func) #endif +#endif typedef enum { aglChoosePixelFormat_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_stats.h b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_stats.h index 72dc3ac078..7992227a3b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_stats.h @@ -16,9 +16,13 @@ extern char* GLX_nativeFunctionNames[]; #define GLX_NATIVE_ENTER(env, that, func) GLX_nativeFunctionCallCount[func]++; #define GLX_NATIVE_EXIT(env, that, func) #else +#ifndef GLX_NATIVE_ENTER #define GLX_NATIVE_ENTER(env, that, func) +#endif +#ifndef GLX_NATIVE_EXIT #define GLX_NATIVE_EXIT(env, that, func) #endif +#endif typedef enum { XVisualInfo_1sizeof_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.h b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.h index 80e2ec8104..c9375d5afc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.h @@ -16,9 +16,13 @@ extern char* WGL_nativeFunctionNames[]; #define WGL_NATIVE_ENTER(env, that, func) WGL_nativeFunctionCallCount[func]++; #define WGL_NATIVE_EXIT(env, that, func) #else +#ifndef WGL_NATIVE_ENTER #define WGL_NATIVE_ENTER(env, that, func) +#endif +#ifndef WGL_NATIVE_EXIT #define WGL_NATIVE_EXIT(env, that, func) #endif +#endif typedef enum { ChoosePixelFormat_FUNC, |