svn commit: r1147617 - in /commons/sandbox/runtime/trunk: build.properties.default src/main/native/os/win32/localsock.c src/main/native/os/win32/sockstream.c

[mturk]

Author: mturk
Date: Sun Jul 17 14:03:48 2011
New Revision: 1147617

URL: http://svn.apache.org/viewvc?rev=1147617&view=rev
Log:
Use correct type for socket

Modified:
    commons/sandbox/runtime/trunk/build.properties.default
    commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/sockstream.c

Modified: commons/sandbox/runtime/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.properties.default?rev=1147617&r1=1147616&r2=1147617&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.properties.default (original)
+++ commons/sandbox/runtime/trunk/build.properties.default Sun Jul 17 14:03:48 
2011
@@ -35,6 +35,6 @@ version.patch.sfx=
 # ----- Default Compile options -----------------------------------------------
 compile.source=1.6
 compile.target=1.6
-compile.debug=off
+compile.debug=on
 compile.optimize=on
 compile.deprecation=on

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c?rev=1147617&r1=1147616&r2=1147617&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c 
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c Sun Jul 
17 14:03:48 2011
@@ -136,6 +136,8 @@ ACR_NET_EXPORT(jint, LocalServerEndpoint
         SOCKADDR_RELEASE(ba, aa);
         return rc;
     }
+    fprintf(stdout, "Creating %S\n", sname);
+    fflush(stdout);
     sfh = CreateFileW(sname, GENERIC_READ | GENERIC_WRITE,
                       FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                       GetSaWithNullDacl(env, JNI_FALSE), CREATE_NEW,
@@ -144,6 +146,8 @@ ACR_NET_EXPORT(jint, LocalServerEndpoint
     if (IS_INVALID_HANDLE(sfh)) {
         rc = GetLastError();
         SOCKADDR_RELEASE(ba, aa);
+            fprintf(stdout, "Failed Creating %S\n", sname);
+                fflush(stdout);
         return rc;
     }
     sa.sin_port        = 0;

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/sockstream.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/sockstream.c?rev=1147617&r1=1147616&r2=1147617&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/sockstream.c 
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/sockstream.c Sun Jul 
17 14:03:48 2011
@@ -139,10 +139,10 @@ ACR_NET_EXPORT(jint, SocketStream, avail
 
 ACR_NET_EXPORT(jint, SocketStream, read0)(JNI_STDARGS, jlong sp)
 {
-    int  sd;
     int  rc = 0;
     int  rv = -1;
     int  rd;
+    SOCKET sd;
     unsigned char ch;
     acr_ss_t *ss = J2P(sp, acr_ss_t *);