mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 01:36:01 +02:00
Code Issues Wiki Activity

Remove not portable function.

Browse source
This commit is contained in:
Alain Magloire 2002-11-07 20:45:17 +00:00
parent c014fcc8bb
commit 596d184814
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c
View file

@ -22,7 +22,7 @@
#include "jni.h" #include "jni.h"
#include "io.h" #include "io.h"
// #define DEBUG_MONITOR #define DEBUG_MONITOR
#define PIPE_SIZE 512 #define PIPE_SIZE 512
#define MAX_CMD_SIZE 1024 #define MAX_CMD_SIZE 1024
@ -44,7 +44,6 @@ typedef struct _procInfo {
static int procCounter = 0; static int procCounter = 0;
JNIEXPORT void * JNICALL GetJVMProc(char * vmlib, char * procName);
JNIEXPORT void JNICALL ThrowByName(JNIEnv *env, const char *name, const char *msg); JNIEXPORT void JNICALL ThrowByName(JNIEnv *env, const char *name, const char *msg);
pProcInfo_t createProcInfo(); pProcInfo_t createProcInfo();
pProcInfo_t findProcInfo(int pid); pProcInfo_t findProcInfo(int pid);
@ -197,9 +196,8 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
if (dir != 0) if (dir != 0)
{ {
const char * str = NULL; const char * str = NULL;
JVM_NativePath nativePath = GetJVMProc(NULL, "_JVM_NativePath@4"); cwd = strdup((*env) -> GetStringUTFChars(env, dir, 0));
cwd = strdup(nativePath(str = (*env) -> GetStringUTFChars(env, dir, 0)));
(*env) -> ReleaseStringUTFChars(env, dir, str); (*env) -> ReleaseStringUTFChars(env, dir, str);
} }
@ -397,8 +395,9 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1
if (dir != 0) if (dir != 0)
{ {
JVM_NativePath nativePath = GetJVMProc(NULL, "_JVM_NativePath@4"); const char * str = NULL;
cwd = strdup(nativePath((*env) -> GetStringUTFChars(env, dir, 0))); cwd = strdup((*env) -> GetStringUTFChars(env, dir, 0));
(*env) -> ReleaseStringUTFChars(env, dir, str);
} }
@ -469,6 +468,8 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_raise
pProcInfo_t pCurProcInfo = findProcInfo(uid); pProcInfo_t pCurProcInfo = findProcInfo(uid);
#ifdef DEBUG_MONITOR #ifdef DEBUG_MONITOR
char buffer[100]; char buffer[100];
sprintf(buffer, "Spawner received signal %i for process %i\n", signal, pCurProcInfo -> pid);
OutputDebugString(buffer);
#endif #endif
if(NULL == pCurProcInfo) if(NULL == pCurProcInfo)
@ -569,18 +570,6 @@ ThrowByName(JNIEnv *env, const char *name, const char *msg)
JNIEXPORT void * JNICALL
GetJVMProc(char * vmlib, char * procName)
{
if(NULL == vmlib)
vmlib = "jvm.dll";
if(NULL == hVM)
{
if(NULL == (hVM = GetModuleHandle(vmlib)))
return NULL;
}
return GetProcAddress(hVM, procName);
}
pProcInfo_t createProcInfo() pProcInfo_t createProcInfo()
{ {
@ -691,7 +680,7 @@ unsigned int _stdcall waitProcTermination(void* pv)
cleanUpProcBlock(pInfo + i); cleanUpProcBlock(pInfo + i);
} }
break; break;
} // Otherwise failed because was not started } // Otherwise failed because was not started
} }
CloseHandle(hProc); CloseHandle(hProc);