Changeset 4146a07


Ignore:
Timestamp:
2005-12-17T01:25:32Z (15 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:
5 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rbd69a21 r4146a07  
    1010
    1111# Program variables
    12 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
     12objects = 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
    1313subdirs = protocols
    1414
     
    1616objects += win32.o
    1717else
    18 objects += unix.o conf.o
     18objects += unix.o conf.o log.o
    1919endif
    2020
  • bitlbee.h

    rbd69a21 r4146a07  
    4848#include <stdio.h>
    4949#include <ctype.h>
     50#include <errno.h>
     51
    5052#ifndef _WIN32
    5153#include <syslog.h>
    52 #include <errno.h>
    5354#endif
    5455
     
    7576#undef strncasecmp
    7677#define strncasecmp     __PLEASE_USE_G_STRNCASECMP_INSTEAD__
    77 
    78 #ifndef F_OK
    79 #define F_OK 0
    80 #endif
    8178
    8279#define _( x ) x
  • doc/BUILD.win32

    rbd69a21 r4146a07  
    1717    - nspr (in nspr/)
    1818
     19  glib and gettext are only required for actually running BitlBee - building
     20  should work fine without them.
     21
    19223. Set the following variables in Makefile.settings, if you don't have the
    2023   libraries above installed in the default directories searched by MSVC:
  • sock.h

    rbd69a21 r4146a07  
    1010#else
    1111# include <winsock2.h>
    12 # ifndef _MSC_VER
    13 #  include <ws2tcpip.h>
    14 # endif
    1512# if !defined(BITLBEE_CORE) && defined(_MSC_VER)
    1613#   pragma comment(lib,"bitlbee.lib")
     
    1916# define read(a,b,c) recv(a,b,c,0)
    2017# define write(a,b,c) send(a,b,c,0)
    21 # define umask _umask
    22 # define mode_t int
    2318# define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
    2419# define sockerr_again() (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK)
  • storage_text.c

    rbd69a21 r4146a07  
    2727#include "bitlbee.h"
    2828#include "crypting.h"
     29#ifdef _WIN32
     30# define umask _umask
     31# define mode_t int
     32#endif
     33
     34#ifndef F_OK
     35#define F_OK 0
     36#endif
    2937
    3038/* DO NOT USE THIS FUNCTION IN NEW CODE. This
Note: See TracChangeset for help on using the changeset viewer.