Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2007-03-13 21:57:16 +0000
committerAndrew Niefer2007-03-13 21:57:16 +0000
commit3cf8518912fb064f582a5fa3b7ef020b2155e1b6 (patch)
tree44287c0f9863f02088a18051335d97a089a631a3 /bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
parent3c156e8434744738d7dc6ca7941378119d19f1a8 (diff)
downloadrt.equinox.framework-3cf8518912fb064f582a5fa3b7ef020b2155e1b6.tar.gz
rt.equinox.framework-3cf8518912fb064f582a5fa3b7ef020b2155e1b6.tar.xz
rt.equinox.framework-3cf8518912fb064f582a5fa3b7ef020b2155e1b6.zip
bug 172367 - WPF port
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/eclipseJNI.c')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipseJNI.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c b/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
index 698ec64ee..9b2a4a055 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipseJNI.c
@@ -47,7 +47,7 @@ static JNIEnv *env = 0;
* able to call out to either, so we will set hooks depending on which version of
* registerNatives gets called.
*/
-#ifndef UNICODE
+#if (!defined(UNICODE) || defined(VISTA))
void (* exitDataHook)(JNIEnv *env, jstring id, jstring s);
void (* dispatchHook)();
long (* splashHandleHook)();
@@ -61,13 +61,13 @@ extern void (* showSplashHook)(JNIEnv *env, jstring s);
extern void (* takeDownHook)();
#endif
-#ifndef UNICODE
+#if (!defined(UNICODE) || defined(VISTA))
/* JNI Callback methods */
JNIEXPORT void JNICALL set_exit_data(JNIEnv * env, jobject obj, jstring id, jstring s){
if(exitDataHook != NULL)
exitDataHook(env, id, s);
else /* hook was not set, just call the ANSI version */
-#ifdef WIN32
+#if (defined(_WIN32) || defined(VISTA))
setExitDataW(env, id, s);
#else
setExitData(env, id, s);

Back to the top