Changeset 4146a07

Timestamp:

2005-12-17T01:25:32Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

643dfc4

Parents:

bd69a21

Message:

Fix win32 build using mingw32 on linux (no ssl and yahoo yet though)

Files:

• Makefile (modified) (2 diffs)
• bitlbee.h (modified) (2 diffs)
• doc/BUILD.win32 (modified) (1 diff)
• sock.h (modified) (2 diffs)
• storage_text.c (modified) (1 diff)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o url.o user.o storage_text.o storage.o
+objects = account.o bitlbee.o commands.o crypting.o help.o ini.o irc.o nick.o query.o set.o url.o user.o storage_text.o storage.o
 subdirs = protocols
 
@@ -16 +16 @@
 objects += win32.o
 else
-objects += unix.o conf.o
+objects += unix.o conf.o log.o
 endif
 

bitlbee.h

@@ -48 +48 @@
 #include <stdio.h>
 #include <ctype.h>
+#include <errno.h>
+
 #ifndef _WIN32
 #include <syslog.h>
-#include <errno.h>
 #endif
 
@@ -75 +76 @@
 #undef strncasecmp
 #define strncasecmp     __PLEASE_USE_G_STRNCASECMP_INSTEAD__
-
-#ifndef F_OK
-#define F_OK 0
-#endif
 
 #define _( x ) x

doc/BUILD.win32

@@ -17 +17 @@
     - nspr (in nspr/)
 
+  glib and gettext are only required for actually running BitlBee - building
+  should work fine without them.
+
 3. Set the following variables in Makefile.settings, if you don't have the 
    libraries above installed in the default directories searched by MSVC:

sock.h

@@ -10 +10 @@
 #else
 # include <winsock2.h>
-# ifndef _MSC_VER
-#  include <ws2tcpip.h>
-# endif
 # if !defined(BITLBEE_CORE) && defined(_MSC_VER)
 #   pragma comment(lib,"bitlbee.lib")
@@ -19 +16 @@
 # define read(a,b,c) recv(a,b,c,0)
 # define write(a,b,c) send(a,b,c,0)
-# define umask _umask
-# define mode_t int
 # define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
 # define sockerr_again() (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK)

storage_text.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "crypting.h"
+#ifdef _WIN32
+# define umask _umask
+# define mode_t int
+#endif
+
+#ifndef F_OK
+#define F_OK 0
+#endif
 
 /* DO NOT USE THIS FUNCTION IN NEW CODE. This