Bug 502238 - Fix Win32 native
Fix C sources and rebuild dll accordingly (with proper target arch).
Change-Id: I48bbced8e5e52a0cd410884c72ff1663f3af799c
Signed-off-by: Mikael Barbero <mikael@eclipse.org>
diff --git a/bundles/org.eclipse.core.resources.win32.x86/os/win32/x86/win32refresh.dll b/bundles/org.eclipse.core.resources.win32.x86/os/win32/x86/win32refresh.dll
index 2fe883c..b134ae3 100644
--- a/bundles/org.eclipse.core.resources.win32.x86/os/win32/x86/win32refresh.dll
+++ b/bundles/org.eclipse.core.resources.win32.x86/os/win32/x86/win32refresh.dll
Binary files differ
diff --git a/bundles/org.eclipse.core.resources.win32.x86_64/os/win32/x86_64/win32refresh.dll b/bundles/org.eclipse.core.resources.win32.x86_64/os/win32/x86_64/win32refresh.dll
index d35c853..512e518 100644
--- a/bundles/org.eclipse.core.resources.win32.x86_64/os/win32/x86_64/win32refresh.dll
+++ b/bundles/org.eclipse.core.resources.win32.x86_64/os/win32/x86_64/win32refresh.dll
Binary files differ
diff --git a/bundles/org.eclipse.core.resources/natives/make.bat b/bundles/org.eclipse.core.resources/natives/make.bat
index a9dba03..615ba20 100644
--- a/bundles/org.eclipse.core.resources/natives/make.bat
+++ b/bundles/org.eclipse.core.resources/natives/make.bat
@@ -21,9 +21,9 @@
set dll_name=win32refresh.dll
call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64_x86
-"c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64_x86\cl.exe" -I%win_include% -I%jdk_include% -I%jdk_include%\win32 -LD ref.c -Fe%dll_name%
+"cl.exe" -I%win_include% -I%jdk_include% -I%jdk_include%\win32 -LD ref.c -Fe%dll_name%
move %dll_name% ..\..\org.eclipse.core.resources.win32.x86\os\win32\x86\%dll_name%
call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-"c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\cl.exe" -I%win_include% -I%jdk_include% -I%jdk_include%\win32 -LD ref.c -Fe%dll_name%
+"cl.exe" -I%win_include% -I%jdk_include% -I%jdk_include%\win32 -LD ref.c -Fe%dll_name%
move %dll_name% ..\..\org.eclipse.core.resources.win32.x86_64\os\win32\x86_64\%dll_name%
\ No newline at end of file
diff --git a/bundles/org.eclipse.core.resources/natives/ref.c b/bundles/org.eclipse.core.resources/natives/ref.c
index 731dddc..d716a57 100644
--- a/bundles/org.eclipse.core.resources/natives/ref.c
+++ b/bundles/org.eclipse.core.resources/natives/ref.c
@@ -252,7 +252,7 @@
* Method: WAIT_ABANDONED_0
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_WAIT_ABANDONED_0
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_WAIT_1ABANDONED_10
(JNIEnv *env, jclass this) {
return WAIT_ABANDONED_0;
}
diff --git a/bundles/org.eclipse.core.resources/natives/ref.h b/bundles/org.eclipse.core.resources/natives/ref.h
index 508e94d..2883e8d 100644
--- a/bundles/org.eclipse.core.resources/natives/ref.h
+++ b/bundles/org.eclipse.core.resources/natives/ref.h
@@ -172,7 +172,7 @@
* Method: WAIT_ABANDONED_0
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_WAIT_ABANDONED_0
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_WAIT_1ABANDONED_10
(JNIEnv *, jclass);
/*
