[svn:parrot] r38004 - in trunk: config/gen/makefiles src/io

[Infinoid at svn.parrot.org]

Author: Infinoid
Date: Fri Apr 10 05:23:05 2009
New Revision: 38004
URL: https://trac.parrot.org/parrot/changeset/38004

Log:
[io] Build fixes from previous botched patch.  Infinoid--

Modified:
   trunk/config/gen/makefiles/root.in
   trunk/src/io/socket_api.c

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Fri Apr 10 05:12:06 2009	(r38003)
+++ trunk/config/gen/makefiles/root.in	Fri Apr 10 05:23:05 2009	(r38004)
@@ -841,6 +841,7 @@
                            $(SRC_DIR)/pmc/timer.c     \
                            $(INC_DIR)/pbcversion.h
 
+$(IO_DIR)/socket_api$(O) : $(SRC_DIR)/pmc/socket.c
 $(IO_DIR)/socket_unix$(O) : $(INC_DIR)/pbcversion.h   \
                             $(SRC_DIR)/pmc/socket.c
 $(IO_DIR)/socket_win32$(O) : $(INC_DIR)/pbcversion.h   \

Modified: trunk/src/io/socket_api.c
==============================================================================
--- trunk/src/io/socket_api.c	Fri Apr 10 05:12:06 2009	(r38003)
+++ trunk/src/io/socket_api.c	Fri Apr 10 05:23:05 2009	(r38004)
@@ -21,6 +21,7 @@
 #include "parrot/parrot.h"
 #include "io_private.h"
 #include "api.str"
+#include "../pmc/pmc_socket.h"
 
 #include <stdarg.h>
 
@@ -111,13 +112,13 @@
 {
     ASSERT_ARGS(Parrot_io_socket_is_closed)
 #ifdef PIO_OS_WIN32
-    return (PARROT_SOCKET(SELF)->os_handle == (PIOHANDLE)INVALID_HANDLE_VALUE);
+    return (PARROT_SOCKET(socket)->os_handle == (PIOHANDLE)INVALID_HANDLE_VALUE);
 #endif
 #ifdef PIO_OS_UNIX
-    return (PARROT_SOCKET(SELF)->os_handle == (PIOHANDLE)-1);
+    return (PARROT_SOCKET(socket)->os_handle == (PIOHANDLE)-1);
 #endif
 #ifdef PIO_OS_STDIO
-    return (PARROT_SOCKET(SELF)->os_handle == (PIOHANDLE)NULL);
+    return (PARROT_SOCKET(socket)->os_handle == (PIOHANDLE)NULL);
 #endif
 }