You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/08/12 12:34:24 UTC
svn commit: r803435 -
/commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c
Author: mturk
Date: Wed Aug 12 10:34:24 2009
New Revision: 803435
URL: http://svn.apache.org/viewvc?rev=803435&view=rev
Log:
Copy the forgotten declarations
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c?rev=803435&r1=803434&r2=803435&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c Wed Aug 12 10:34:24 2009
@@ -232,6 +232,9 @@
static int initialized = 0;
ACR_DECLARE(int) ACR_Initialize(JavaVM *vm)
{
+ DWORD rc;
+ UINT em;
+ const wchar_t **pp = &sePrivileges[0];
if (initialized++)
return 0;
@@ -247,7 +250,7 @@
acr_init_log_source(LOG_MSG_DOMAIN);
do_syslog(ACR_LOG_ERROR,
L"Failed loading system libraries", rc);
- return JNI_ERR;
+ return (int)rc;
}
/* Allocate a TLS index. */
if ((dll_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) {
@@ -275,11 +278,8 @@
/* Called by the JVM when ACR is loaded */
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
{
- UINT em;
- DWORD rc;
JNIEnv *env;
void *epp;
- const wchar_t **pp = &sePrivileges[0];
UNREFERENCED(reserved);
if ((*vm)->GetEnv(vm, &epp, JNI_VERSION_1_4)) {