[Octave-cvsupdate] SF.net SVN: octave:[8485] trunk/octave-forge/main/sockets/src

[<gof...@us...>]

Revision: 8485
          http://octave.svn.sourceforge.net/octave/?rev=8485&view=rev
Author:   goffioul
Date:     2011-09-01 21:49:49 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Allow compilation with octave development sources and Win32 API.

Modified Paths:
--------------
    trunk/octave-forge/main/sockets/src/Makefile
    trunk/octave-forge/main/sockets/src/sockets.cc

Modified: trunk/octave-forge/main/sockets/src/Makefile
===================================================================
--- trunk/octave-forge/main/sockets/src/Makefile	2011-09-01 15:12:29 UTC (rev 8484)
+++ trunk/octave-forge/main/sockets/src/Makefile	2011-09-01 21:49:49 UTC (rev 8485)
@@ -3,9 +3,9 @@
 
 #See which octave version we run by querying mkoctfile for its version
 #string. (Is there a better way to do this? This looks horrible.) 
-majorversion :=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)$$/\1/g')
-minorversion:=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)$$/\2/g')
-microversion:=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)$$/\3/g')
+majorversion :=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)+\?$$/\1/g')
+minorversion:=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)+\?$$/\2/g')
+microversion:=$(shell mkoctfile --version 2>&1 |sed -e 's/^.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\)+\?$$/\3/g')
 
 VFLAGS=-DMAJORVERSION=$(majorversion) 
 VFLAGS+=-DMINORVERSION=$(minorversion)

Modified: trunk/octave-forge/main/sockets/src/sockets.cc
===================================================================
--- trunk/octave-forge/main/sockets/src/sockets.cc	2011-09-01 15:12:29 UTC (rev 8484)
+++ trunk/octave-forge/main/sockets/src/sockets.cc	2011-09-01 21:49:49 UTC (rev 8485)
@@ -39,6 +39,7 @@
 #endif
 #else
 typedef unsigned int socklen_t;
+#include <winsock2.h>
 #endif
 #include <errno.h>
 
@@ -254,8 +255,10 @@
 
 // PKG_ADD: autoload ("MSG_PEEK", "sockets.oct");
 DEFUN_DLD_SOCKET_CONSTANT(MSG_PEEK, "socket constant" );
+#ifndef __WIN32__
 // PKG_ADD: autoload ("MSG_DONTWAIT", "sockets.oct");
 DEFUN_DLD_SOCKET_CONSTANT(MSG_DONTWAIT, "socket constant" );
+#endif
 // PKG_ADD: autoload ("MSG_WAITALL", "sockets.oct");
 DEFUN_DLD_SOCKET_CONSTANT(MSG_WAITALL, "socket constant" );
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.