Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/wsock32/wsock32.h

    r21417 r21916  
    1717
    1818#include "socketwrap.h"
    19 #include <sys\time.h>
     19#include <sys/time.h>
    2020
    2121#include <odinwrap.h>
     22
     23#ifdef __EMX__
     24// EMX 0.6.4 and before lacks this
     25#ifndef SOCBASEERR
     26#define SOCBASEERR 0
     27#endif
     28#endif
    2229
    2330#ifndef IP_TTL
    … …  
    128135typedef u_int           SOCKET;
    129136
     137#ifndef FD_SETSIZE
    130138#define FD_SETSIZE      64
     139#endif
    131140
    132141#pragma pack(1)
Note: See TracChangeset for help on using the changeset viewer.