[cdt-patch] WinDbg NATIVE defines have wrong package name

[Hasse Hellberg <hasse@xxxxxxxxxxxxxxx>]

Hello cdt-patch-request and especially Doug Schaefer ,

Here's the first in a line of updates to the WinDbg plugging.
I'm a compleat newbee on this type of patch system so
please inform me on anything i do wrong :)


Adding 4 fixes/changes to 4 files in the plugging
"org.eclipse.cdt.debug.win32.core".
All 4 .cpp files in the "native" catalog need the same fix.
And that is:  NATIVE defines have wrong package name!
Adding text "_core" fixes the package name.

Fixing this and rebuilding the dll file resulted in success!
Now the run-time workbench launch and the debugger
can be selected and used. However new bugs was discovered
now when debugging "work". If somebody doesn't makes it before me
I will try to solve them :)

-Hasse


Index: frame.cpp
===================================================================
RCS file: /home/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.win32.core/native/frame.cpp,v
retrieving revision 1.1
diff -u -r1.1 frame.cpp
--- frame.cpp   5 Jul 2004 20:46:51 -0000       1.1
+++ frame.cpp   11 Jul 2004 09:35:15 -0000
@@ -16,7 +16,7 @@
 
 static jmethodID addVariableID;
 
-#define NATIVE(type, name) extern "C" JNIEXPORT type JNICALL
Java_org_eclipse_cdt_debug_win32_cdi_WinDbgStackFrame_##name
+#define NATIVE(type, name) extern "C" JNIEXPORT type JNICALL
Java_org_eclipse_cdt_debug_win32_core_cdi_WinDbgStackFrame_##name
 
 NATIVE(void, initNative)(JNIEnv * env, jclass cls)
 {
Index: process.cpp
===================================================================
RCS file: /home/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.win32.core/native/process.cpp,v
retrieving revision 1.1
diff -u -r1.1 process.cpp
--- process.cpp 5 Jul 2004 20:46:51 -0000       1.1
+++ process.cpp 11 Jul 2004 09:35:15 -0000
@@ -152,7 +152,7 @@
        TerminateProcess(pi.hProcess, -1);
 }
 
-#define NATIVE(type, name) extern "C" JNIEXPORT type JNICALL
Java_org_eclipse_cdt_debug_win32_cdi_WinDbgProcess_##name
+#define NATIVE(type, name) extern "C" JNIEXPORT type JNICALL
Java_org_eclipse_cdt_debug_win32_core_cdi_WinDbgProcess_##name
 
 static jfieldID pID;
 
Index: target.cpp
===================================================================
RCS file: /home/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.win32.core/native/target.cpp,v
retrieving revision 1.1
diff -u -r1.1 target.cpp
--- target.cpp  5 Jul 2004 20:46:51 -0000       1.1
+++ target.cpp  11 Jul 2004 09:35:15 -0000
@@ -303,7 +303,7 @@
 
 // JNI interface
 
-#define NATIVE(type, name) extern "C" JNIEXPORT type JNICALL
Java_org_eclipse_cdt_debug_win32_cdi_WinDbgTarget_##name
+#define NATIVE(type, name) extern "C" JNIEXPORT type JNICALL
Java_org_eclipse_cdt_debug_win32_core_cdi_WinDbgTarget_##name
 
 static jfieldID pID;
 
Index: thread.cpp
===================================================================
RCS file: /home/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.win32.core/native/thread.cpp,v
retrieving revision 1.1
diff -u -r1.1 thread.cpp
--- thread.cpp  5 Jul 2004 20:46:51 -0000       1.1
+++ thread.cpp  11 Jul 2004 09:35:15 -0000
@@ -13,7 +13,7 @@

 #include <stdio.h>
 #include <jni.h>
 
-#define NATIVE(type, name) extern "C" JNIEXPORT type JNICALL
Java_org_eclipse_cdt_debug_win32_cdi_WinDbgThread_##name
+#define NATIVE(type, name) extern "C" JNIEXPORT type JNICALL
Java_org_eclipse_cdt_debug_win32_core_cdi_WinDbgThread_##name
 
 static jfieldID processHandleID;
 static jfieldID threadHandleID;