Changeset e252d8c


Ignore:
Timestamp:
2014-09-27T14:54:35Z (10 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
ebe2c5e, f329dfc
Parents:
d348377
Message:

RIP native win32 support (use cygwin instead)

It has been broken for a very long time and nobody cared about it.

Files:
3 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rd348377 re252d8c  
    1010
    1111# Program variables
    12 objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
     12objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o conf.o log.o
    1313headers = $(wildcard *.h lib/*.h protocols/*.h)
    1414subdirs = lib protocols
    1515
    16 ifeq ($(TARGET),i586-mingw32msvc)
    17 objects += win32.o
    18 LDFLAGS+=-lws2_32
    19 EFLAGS+=-lsecur32
    20 OUTFILE=bitlbee.exe
    21 else
    22 objects += unix.o conf.o log.o
    23 OUTFILE=bitlbee
    24 endif
     16OUTFILE = bitlbee
    2517
    2618# Expansion of variables

  • bitlbee.c

    rd348377 re252d8c  
    127127        global.listen_watch_source_id = b_input_add( global.listen_socket, B_EV_IO_READ, bitlbee_io_new_client, NULL );
    128128       
    129 #ifndef _WIN32
    130129        if( !global.conf->nofork )
    131130        {
    … …  
    151150                                }
    152151        }
    153 #endif
    154152       
    155153        if( global.conf->runmode == RUNMODE_FORKDAEMON )
    … …  
    159157                ipc_master_listen_socket();
    160158       
    161 #ifndef _WIN32
    162159        if( ( fp = fopen( global.conf->pidfile, "w" ) ) )
    163160        {
    … …  
    169166                log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile );
    170167        }
    171 #endif
    172168       
    173169        if( !global.conf->nofork )
    … …  
    295291        }
    296292       
    297 #ifndef _WIN32
    298293        if( global.conf->runmode == RUNMODE_FORKDAEMON )
    299294        {
    … …  
    357352        }
    358353        else
    359 #endif
    360354        {
    361355                log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );

  • bitlbee.h

    rd348377 re252d8c  
    3535#endif
    3636
    37 /* Depend on Windows 2000 for now since we need getaddrinfo() */
    38 #define _WIN32_WINNT 0x0501
    39 
    4037#define PACKAGE "BitlBee"
    4138#define BITLBEE_VERSION "3.2.2"
    … …  
    6057#include <ctype.h>
    6158#include <errno.h>
    62 
    63 #ifndef _WIN32
    6459#include <syslog.h>
    65 #endif
    66 
    6760#include <glib.h>
    6861#include <gmodule.h>

  • configure

    rd348377 re252d8c  
    484484elif [ "$ssl" = "nss" ]; then
    485485        detect_nss
    486 elif [ "$ssl" = "sspi" ]; then
    487         echo
    488486elif [ "$ssl" = "openssl" ]; then
    489487        echo
    … …  
    806804;;
    807805CYGWIN* )
    808         echo 'Cygwin is not officially supported.'
    809806;;
    810807Windows )
     808        echo 'Native windows compilation is not supported anymore, use cygwin instead.'
    811809;;
    812810* )

  • help.c

    rd348377 re252d8c  
    4242        *help = h = g_new0 ( help_t, 1 );
    4343       
    44         h->fd = open( helpfile, O_RDONLY
    45 #ifdef _WIN32
    46                                   | O_BINARY
    47 #endif
    48                                   );
     44        h->fd = open( helpfile, O_RDONLY );
    4945       
    5046        if( h->fd == -1 )

  • ipc.c

    rd348377 re252d8c  
    2828#include "ipc.h"
    2929#include "commands.h"
    30 #ifndef _WIN32
    3130#include <sys/uio.h>
    3231#include <sys/un.h>
    33 #endif
    3432
    3533GSList *child_list = NULL;
    … …  
    843841}
    844842
    845 #ifndef _WIN32
    846843char *ipc_master_save_state()
    847844{
    … …  
    942939        return 1;
    943940}
    944 #else
    945 int ipc_master_listen_socket()
    946 {
    947         /* FIXME: Open named pipe \\.\BITLBEE */
    948         return 0;
    949 }
    950 #endif
    951941
    952942int ipc_master_load_state( char *statefile )

  • lib/events.h

    rd348377 re252d8c  
    3737
    3838#include <sys/types.h>
    39 #ifndef _WIN32
    4039#include <sys/socket.h>
    4140#include <netdb.h>
    4241#include <netinet/in.h>
    43 #endif
    4442#include <glib.h>
    4543#include <gmodule.h>

  • lib/events_glib.c

    rd348377 re252d8c  
    3131#include <string.h>
    3232#include <sys/types.h>
    33 #ifndef _WIN32
    3433#include <sys/socket.h>
    3534#include <netdb.h>
    … …  
    3736#include <arpa/inet.h>
    3837#include <unistd.h>
    39 #else
    40 #include "sock.h"
    41 #define ETIMEDOUT WSAETIMEDOUT
    42 #define EINPROGRESS WSAEINPROGRESS
    43 #endif
    4438#include <fcntl.h>
    4539#include <errno.h>

  • lib/misc.c

    rd348377 re252d8c  
    420420void random_bytes( unsigned char *buf, int count )
    421421{
    422 #ifndef _WIN32
    423422        static int use_dev = -1;
    424423       
    … …  
    470469       
    471470        if( !use_dev )
    472 #endif
    473471        {
    474472                int i;

  • lib/proxy.c

    rd348377 re252d8c  
    2626#include <string.h>
    2727#include <sys/types.h>
    28 #ifndef _WIN32
    2928#include <sys/socket.h>
    3029#include <netdb.h>
    … …  
    3231#include <arpa/inet.h>
    3332#include <unistd.h>
    34 #else
    35 #include "sock.h"
    36 #define ETIMEDOUT WSAETIMEDOUT
    37 #define EINPROGRESS WSAEINPROGRESS
    38 #endif
    3933#include <fcntl.h>
    4034#include <errno.h>
    … …  
    7670        len = sizeof(error);
    7771       
    78 #ifndef _WIN32
    7972        if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0 || error) {
    8073                if ((phb->gai_cur = phb->gai_cur->ai_next)) {
    … …  
    10194                return FALSE;
    10295        }
    103 #endif
    10496        freeaddrinfo(phb->gai);
    10597        sock_make_blocking(source);

  • lib/proxy.h

    rd348377 re252d8c  
    2828
    2929#include <sys/types.h>
    30 #ifndef _WIN32
    3130#include <sys/socket.h>
    3231#include <netdb.h>
    3332#include <netinet/in.h>
    34 #endif
    3533#include <glib.h>
    3634#include <gmodule.h>

  • protocols/msn/soap.h

    rd348377 re252d8c  
    3636#include <string.h>
    3737#include <sys/types.h>
    38 #ifndef _WIN32
    3938#include <sys/socket.h>
    4039#include <netinet/in.h>
    4140#include <arpa/inet.h>
    4241#include <unistd.h>
    43 #endif
    4442#include "nogaim.h"
    4543

  • protocols/oscar/rxqueue.c

    rd348377 re252d8c  
    99#include <aim.h>
    1010
    11 #ifndef _WIN32
    1211#include <sys/socket.h>
    13 #endif
    1412
    1513/*

  • protocols/oscar/txqueue.c

    rd348377 re252d8c  
    99#include "im.h"
    1010
    11 #ifndef _WIN32
    1211#include <sys/socket.h>
    13 #endif
    1412
    1513/*

  • protocols/yahoo/libyahoo2.c

    rd348377 re252d8c  
    4848 */
    4949
    50 #ifndef _WIN32
    5150#include <unistd.h>
    52 #endif
    5351#include <errno.h>
    5452#include <stdio.h>

  • protocols/yahoo/yahoo_httplib.c

    rd348377 re252d8c  
    3838
    3939#include <errno.h>
    40 #ifndef _WIN32
    4140#include <unistd.h>
    42 #endif
    4341#include <ctype.h>
    4442#include "yahoo2.h"

  • protocols/yahoo/yahoo_util.h

    rd348377 re252d8c  
    6565void y_strfreev(char **vector);
    6666
    67 #ifndef _WIN32
    6867int strncasecmp(const char *s1, const char *s2, size_t n);
    6968int strcasecmp(const char *s1, const char *s2);
    … …  
    7372int snprintf(char *str, size_t size, const char *format, ...);
    7473int vsnprintf(char *str, size_t size, const char *format, va_list ap);
    75 #endif
    7674
    7775#endif

  • sock.h

    rd348377 re252d8c  
    22#include <fcntl.h>
    33
    4 #ifndef _WIN32
    54#include <unistd.h>
    65#include <sys/socket.h>
    … …  
    1211#define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
    1312void closesocket( int fd );
    14 #else
    15 # include <winsock2.h>
    16 # include <ws2tcpip.h>
    17 # if !defined(BITLBEE_CORE) && defined(_MSC_VER)
    18 #   pragma comment(lib,"bitlbee.lib")
    19 # endif
    20 # include <io.h>
    21 # define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
    22 # define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); }
    23 # define sockerr_again() (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK)
    24 # define ETIMEDOUT WSAETIMEDOUT
    25 # define sleep(a) Sleep(a*1000)
    26 #endif
Note: See TracChangeset for help on using the changeset viewer.