summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT PI/win32
diff options
context:
space:
mode:
authorSilenio Quarti <silenio_quarti@ca.ibm.com>2012-03-29 17:23:51 -0400
committerSilenio Quarti <silenio_quarti@ca.ibm.com>2012-03-29 17:23:51 -0400
commitc742be31d3e1604d8d4956fde8d816377bf5b0d0 (patch)
treef8007e1774c53cdff7359a0c1b58e96e20fff409 /bundles/org.eclipse.swt/Eclipse SWT PI/win32
parent58df76a2e50f26900ab1ed223960bfd79d3eba45 (diff)
downloadeclipse.platform.swt-c742be31d3e1604d8d4956fde8d816377bf5b0d0.tar.gz
eclipse.platform.swt-c742be31d3e1604d8d4956fde8d816377bf5b0d0.tar.xz
eclipse.platform.swt-c742be31d3e1604d8d4956fde8d816377bf5b0d0.zip
need to be able to overwrite native package name (actual code)
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/win32')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c2
3 files changed, 8 insertions, 2 deletions
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)