Finally rearranged the system to put all compatability files in a directory

called compat.  I've updated the linux and windows builds and it looks pretty
good.  I also added a config.h file which we have to edit by hand until I can
work on build some more.  Linux File operations now use 64 bit mode, windows
can't, or at least, I don't feel like researching it right now.

4 files changed, 355 insertions, 0 deletions

diff --git a/src/compat/linux.h b/src/compat/linux.h
new file mode 100644
index 0000000..ccc8536
--- /dev/null
+++ b/src/compat/linux.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#ifdef __linux__
+
+#define bu_inet_ntoa inet_ntoa
+#define bu_inet_addr inet_addr
+#define bu_select select
+#define bu_socket socket
+#define bu_shutdown shutdown
+#define bu_htons htons
+#define bu_htonl htonl
+#define bu_gethostbyname gethostbyname
+#define bu_freeaddrinfo freeaddrinfo
+#define bu_getaddrinfo getaddrinfo
+#define bu_connect connect
+#define bu_getpeername getpeername
+#define bu_setsockopt setsockopt
+#define bu_bind bind
+#define bu_listen listen
+#define bu_accept accept
+#define bu_send send
+#define bu_recv recv
+
+#define bu_gai_strerror gai_strerror
+
+#endif
diff --git a/src/compat/osx.h b/src/compat/osx.h
new file mode 100644
index 0000000..7169d7e
--- /dev/null
+++ b/src/compat/osx.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#ifndef OSX_COMPATIBILITY__H
+#define OSX_COMPATIBILITY__H
+
+#ifdef __APPLE__
+
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression)            \
+  (__extension__                                  \
+    ({ long int __result;                         \
+      do __result = (long int) (expression);      \
+      while (__result == -1L && errno == EINTR);  \
+      __result; }))
+#endif
+
+#include <sched.h>
+
+#define pthread_yield() sched_yield()
+#endif /* __APPLE__ */
+#endif
+
diff --git a/src/compat/win32.cpp b/src/compat/win32.cpp
new file mode 100644
index 0000000..6fcac15
--- /dev/null
+++ b/src/compat/win32.cpp
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#include "bu/compat/win32.h"
+
+#ifdef WIN32
+
+#define deffunc( name ) \
+        Bu::Winsock2::FNDEF_DYN_ ##name Bu::Winsock2::_fnptr_ ##name = NULL
+
+char Bu::Winsock2::scode[15];
+
+deffunc( WSAStartup );
+deffunc( WSACleanup );
+deffunc( WSAGetLastError );
+deffunc( inet_ntoa );
+deffunc( inet_addr );
+deffunc( select );
+deffunc( socket );
+deffunc( shutdown );
+deffunc( ioctlsocket );
+deffunc( htons );
+deffunc( htonl );
+deffunc( gethostbyname );
+deffunc( freeaddrinfo );
+deffunc( getaddrinfo );
+deffunc( connect );
+deffunc( getpeername );
+deffunc( setsockopt );
+deffunc( bind );
+deffunc( listen );
+deffunc( accept );      
+deffunc( recv );
+deffunc( send );
+deffunc( __WSAFDIsSet );
+
+// Safely get a function from the library
+#define getfunc( name ) \
+        Bu::Winsock2::_fnptr_ ##name = (FNDEF_DYN_ ##name) \
+                GetProcAddress( Ws2_32, #name ); \
+        if( Bu::Winsock2::_fnptr_ ##name == NULL ) { \
+                throw Bu::ExceptionBase("Error loading function " #name " from dll.");\
+        } (void)0
+
+Bu::Winsock2::Winsock2()
+{
+        Ws2_32 = LoadLibrary(TEXT("WS2_32.DLL"));
+
+        getfunc( WSAStartup );
+        getfunc( WSACleanup );
+        getfunc( WSAGetLastError );
+        getfunc( inet_ntoa );
+        getfunc( inet_addr );
+        getfunc( select );
+        getfunc( socket );
+        getfunc( shutdown );
+        getfunc( ioctlsocket );
+        getfunc( htons );
+        getfunc( htonl );
+        getfunc( gethostbyname );
+        getfunc( freeaddrinfo );
+        getfunc( getaddrinfo );
+        getfunc( connect );
+        getfunc( getpeername );
+        getfunc( setsockopt );
+        getfunc( bind );
+        getfunc( listen );
+        getfunc( accept );      
+        getfunc( recv );
+        getfunc( send );
+        getfunc( __WSAFDIsSet );
+
+        Bu::Winsock2::WSAStartup( MAKEWORD(2, 2), &wsaData );
+}
+
+Bu::Winsock2::~Winsock2()
+{
+        Bu::Winsock2::WSACleanup();
+        FreeLibrary( Ws2_32 );
+}
+
+char *Bu::Winsock2::gai_strerror( int iCode )
+{
+        sprintf( scode, "%d", Bu::Winsock2::WSAGetLastError() );
+        return scode;
+}
+
+int Bu::Winsock2::WSAStartup( WORD a, LPWSADATA b ) {
+        return (*Bu::Winsock2::_fnptr_WSAStartup)( a, b );
+}
+int Bu::Winsock2::WSACleanup( ) {
+        return (*Bu::Winsock2::_fnptr_WSACleanup)();
+}
+int Bu::Winsock2::WSAGetLastError( ) {
+        return (*Bu::Winsock2::_fnptr_WSAGetLastError)();
+}
+char * Bu::Winsock2::inet_ntoa( struct in_addr a ) {
+        return (*Bu::Winsock2::_fnptr_inet_ntoa)( a );
+}
+unsigned long Bu::Winsock2::inet_addr( const char *s_in ) {
+        return (*Bu::Winsock2::_fnptr_inet_addr)( s_in );
+}
+int Bu::Winsock2::select( int a, fd_set *b, fd_set *c, fd_set *d,
+                const struct timeval *e ) {
+        return (*Bu::Winsock2::_fnptr_select)( a, b, c, d, e );
+}
+SOCKET Bu::Winsock2::socket( int domain, int type, int protocol ) {
+        return (*Bu::Winsock2::_fnptr_socket)( domain, type, protocol );
+}
+int Bu::Winsock2::shutdown( SOCKET s, int how ) {
+        return (*Bu::Winsock2::_fnptr_shutdown)( s, how );
+}
+int Bu::Winsock2::ioctlsocket( SOCKET s, long cmd, u_long *argp ) {
+        return (*Bu::Winsock2::_fnptr_ioctlsocket)( s, cmd, argp );
+}
+u_short Bu::Winsock2::htons( u_short in ) {
+        return (*Bu::Winsock2::_fnptr_htons)( in );
+}
+u_long Bu::Winsock2::htonl( u_long in ) {
+        return (*Bu::Winsock2::_fnptr_htonl)( in );
+}
+struct hostent * Bu::Winsock2::gethostbyname( const char *name ) {
+        return (*Bu::Winsock2::_fnptr_gethostbyname)( name );
+}
+void Bu::Winsock2::freeaddrinfo( struct addrinfo *ai ) {
+        return (*Bu::Winsock2::_fnptr_freeaddrinfo)( ai );
+}
+int Bu::Winsock2::getaddrinfo( const char *a, const char *b,
+                const struct addrinfo *c, struct addrinfo **d ) {
+        return (*Bu::Winsock2::_fnptr_getaddrinfo)( a, b, c, d );
+}
+int Bu::Winsock2::connect( SOCKET s, const struct sockaddr *a, int b ) {
+        return (*Bu::Winsock2::_fnptr_connect)( s, a, b );
+}
+int Bu::Winsock2::getpeername( SOCKET s, struct sockaddr *a, int *b ) {
+        return (*Bu::Winsock2::_fnptr_getpeername)( s, a, b);
+}
+int Bu::Winsock2::setsockopt( SOCKET s, int a, int b,
+                const char *c, int d ) {
+        return (*Bu::Winsock2::_fnptr_setsockopt)( s, a, b, c, d );
+}
+int Bu::Winsock2::bind( SOCKET s, const struct sockaddr *a, int b ) {
+        return (*Bu::Winsock2::_fnptr_bind)( s, a, b );
+}
+int Bu::Winsock2::listen( SOCKET s, int backlog ) {
+        return (*Bu::Winsock2::_fnptr_listen)( s, backlog );
+}
+SOCKET Bu::Winsock2::accept( SOCKET s, struct sockaddr *a, int *b ) {   
+        return (*Bu::Winsock2::_fnptr_accept)( s, a, b );
+}
+int Bu::Winsock2::recv( SOCKET s, char *buf, int len, int flags ) {
+        return (*Bu::Winsock2::_fnptr_recv)( s, buf, len, flags );
+}
+int Bu::Winsock2::send( SOCKET s, const char *buf, int len, int flags ) {
+        return (*Bu::Winsock2::_fnptr_send)( s, buf, len, flags );
+}
+int Bu::Winsock2::__WSAFDIsSet( SOCKET s, fd_set *set ) {
+        return (*Bu::Winsock2::_fnptr___WSAFDIsSet)( s, set );
+}
+
+#endif
+
diff --git a/src/compat/win32.h b/src/compat/win32.h
new file mode 100644
index 0000000..6304d4c
--- /dev/null
+++ b/src/compat/win32.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2007-2010 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#ifndef WIN32_COMPATIBILITY__H
+#define WIN32_COMPATIBILITY__H
+
+#ifdef WIN32
+
+#ifdef __cplusplus
+extern "C" 
+{
+#include <Winsock2.h>
+#include <ws2tcpip.h>
+}
+#endif
+
+#include "bu/fstring.h"
+#include "bu/singleton.h"
+
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression)            \
+  (__extension__                                  \
+    ({ long int __result;                         \
+      do __result = (long int) (expression);      \
+      while (__result == -1L && errno == EINTR);  \
+      __result; }))
+#endif
+
+#define decltype( ret, name, ... ) \
+        typedef ret (__cdecl *FNDEF_DYN_ ##name)( __VA_ARGS__ ); \
+        static FNDEF_DYN_ ##name _fnptr_ ##name; \
+        static ret name( __VA_ARGS__ )
+
+__extension__ typedef int socklen_t;
+
+#ifdef gai_strerror
+#undef gai_strerror
+#endif
+
+namespace Bu
+{
+        class Winsock2 : public Bu::Singleton<Winsock2>
+        {
+        friend class Bu::Singleton<Winsock2>;
+        private:
+                Winsock2();
+                virtual ~Winsock2();
+
+                WSADATA wsaData;
+                HINSTANCE Ws2_32;
+
+        public:
+                // decltype( return type, function name<, optional parameters> )
+                decltype( int, WSAStartup, WORD, LPWSADATA );
+                decltype( int, WSACleanup );
+                decltype( int, WSAGetLastError );
+                decltype( char *, inet_ntoa, struct in_addr );
+                decltype( unsigned long, inet_addr, const char *s_in );
+                decltype( int, select, int nfds, fd_set *readfds, fd_set *writefds, 
+                                fd_set *exceptfds, const struct timeval *timeout );
+                decltype( SOCKET, socket, int domain, int type, int protocol );
+                decltype( int, shutdown, SOCKET s, int how );
+                decltype( int, ioctlsocket, SOCKET s, long cmd, u_long *argp );
+                decltype( u_short, htons, u_short in );
+                decltype( u_long, htonl, u_long in );
+                decltype( struct hostent *, gethostbyname, const char *name );
+                decltype( void, freeaddrinfo, struct addrinfo *ai );
+                decltype( int, getaddrinfo, const char *nodename, const char *servname,
+                                const struct addrinfo *hints, struct addrinfo **res );
+                decltype( int, connect, SOCKET s, const struct sockaddr *serv_addr,
+                                int addrlen );
+                decltype( int, getpeername, SOCKET s, struct sockaddr *name,
+                                int *namelen );
+                decltype( int, setsockopt, SOCKET s, int level, int optname,
+                                const char *optval, int optlen );
+                decltype( int, bind, SOCKET s, const struct sockaddr *my_addr,
+                                int addrlen );
+                decltype( int, listen, SOCKET s, int backlog );
+                decltype( SOCKET, accept, SOCKET s, struct sockaddr *addr,
+                                int *addrlen);  
+                decltype( int, recv, SOCKET s, char *buf, int len, int flags );
+                decltype( int, send, SOCKET s, const char *buf, int len, int flags );
+                decltype( int, __WSAFDIsSet, SOCKET s, fd_set *set );
+        
+                static char scode[15];
+                static char *gai_strerror( int iCode );
+        };
+};
+
+#ifdef FD_ISSET
+#undef FD_ISSET
+#endif
+
+#define bu_WSAStartup (*Bu::Winsock2::WSAStartup)
+#define bu_WSACleanup (*Bu::Winsock2::WSACleanup)
+#define bu_WSAGetLastError (*Bu::Winsock2::WSAGetLastError)
+#define bu_inet_ntoa (*Bu::Winsock2::inet_ntoa)
+#define bu_inet_addr (*Bu::Winsock2::inet_addr)
+#define bu_select (*Bu::Winsock2::select)
+#define bu_socket (*Bu::Winsock2::socket)
+#define bu_shutdown (*Bu::Winsock2::shutdown)
+#define bu_ioctlsocket (*Bu::Winsock2::ioctlsocket)
+#define bu_htons (*Bu::Winsock2::htons)
+#define bu_htonl (*Bu::Winsock2::htonl)
+#define bu_gethostbyname (*Bu::Winsock2::gethostbyname)
+#define bu_freeaddrinfo (*Bu::Winsock2::freeaddrinfo)
+#define bu_getaddrinfo (*Bu::Winsock2::getaddrinfo)
+#define bu_connect (*Bu::Winsock2::connect)
+#define bu_getpeername (*Bu::Winsock2::getpeername)
+#define bu_setsockopt (*Bu::Winsock2::setsockopt)
+#define bu_bind (*Bu::Winsock2::bind)
+#define bu_listen (*Bu::Winsock2::listen)
+#define bu_accept (*Bu::Winsock2::accept)       
+#define bu_recv (*Bu::Winsock2::recv)
+#define bu_send (*Bu::Winsock2::send)
+#define bu___WSAFDIsSet (*Bu::Winsock2::__WSAFDIsSet)
+
+#define FD_ISSET (*Bu::Winsock2::__WSAFDIsSet)
+#define bu_gai_strerror Bu::Winsock2::gai_strerror
+
+#undef decltype
+
+#undef USE_64BIT_IO
+
+#endif /* WIN32 */
+#endif
+