Changeset 311 in Main for trunk/Server


Ignore:
Timestamp:
Oct 13, 2024, 10:23:22 AM (5 weeks ago)
Author:
Nishi
Message:

attempting to add os/2

Location:
trunk/Server
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Server/config.c

    r257 r311  
    1616#endif
    1717
    18 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
     18#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
    1919#ifdef USE_WINSOCK1
    2020#include <winsock.h>

  • trunk/Server/main.c

    r310 r311  
    3131#include "tw_version.h"
    3232
    33 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
     33#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
    3434#include <windows.h>
    3535#endif
    … …  
    8989int startup(int argc, char** argv);
    9090
    91 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)
     91#if defined(__MINGW32__) || defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__OS2__)) || defined(__BORLANDC__)
    9292char* get_registry(const char* main, const char* sub) {
    9393        DWORD bufsize = 512;
    … …  
    718718        int i;
    719719        char* r;
    720 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)
     720#if defined(__MINGW32__) || defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__OS2__)) || defined(__BORLANDC__)
    721721        char* confpath = cm_strdup(PREFIX "/etc/tewi.conf");
    722722        char* regpath = get_registry("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Tewi HTTPd", "InstallDir");

  • trunk/Server/server.c

    r304 r311  
    3333#include <cm_dir.h>
    3434
    35 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
     35#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
    3636#ifndef NO_GETNAMEINFO
    3737#include <ws2tcpip.h>

  • trunk/Server/tw_config.h

    r258 r311  
    1515#include <stdbool.h>
    1616
    17 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
     17#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
    1818#ifdef USE_WINSOCK1
    1919#include <winsock.h>
Note: See TracChangeset for help on using the changeset viewer.