[Monetdb-developers] [Monetdb-checkins] MonetDB/src/common monet_utils.mx, 1.32, 1.33 stream.mx, 1.144, 1.145

Steffen Goeldner sgoeldner at cpan.org
Wed Apr 11 14:24:00 CEST 2007


Niels Nes wrote:

> Update of /cvsroot/monetdb/MonetDB/src/common
> In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31245/src/common
> 
> Modified Files:
> 	monet_utils.mx stream.mx 
> Log Message:
> include files used by other parts should expose as little of the system 
> includes as possible, ie moved some includes from header files to the 
> c-code part
> 
> 
> Index: stream.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/MonetDB/src/common/stream.mx,v
> retrieving revision 1.144
> retrieving revision 1.145
> diff -u -d -r1.144 -r1.145
> --- stream.mx	27 Mar 2007 16:46:50 -0000	1.144
> +++ stream.mx	3 Apr 2007 08:54:37 -0000	1.145
> @@ -53,13 +53,6 @@
>  #include <signal.h>
>  #include <limits.h>
>  
> -#ifdef HAVE_SYS_SOCKET_H
> -#include <sys/socket.h>
> -#endif
> -#ifdef NATIVE_WIN32
> -# include <winsock.h>
> -#endif
> -
>  #ifdef NATIVE_WIN32
>  #ifndef LIBSTREAM
>  #define stream_export extern __declspec(dllimport)
> @@ -292,8 +285,14 @@
>  # include <netinet/tcp.h>
>  # include <netdb.h>
>  #endif
> +
> +#ifdef HAVE_SYS_SOCKET_H
> +#include <sys/socket.h>
> +#endif
> +
>  #ifdef NATIVE_WIN32
>  #include <io.h>
> +#include <winsock.h>
>  #endif
>  #ifdef HAVE_FCNTL_H
>  #include <fcntl.h>

On W2K (MS VC++ Toolkit 2003):

   stream.mx(164) : error C2146: syntax error : missing ')' before identifier 'socket'


Steffen




More information about the developers-list mailing list