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/rpcrt4/uuid.cpp

    r3325 r21916  
    3535
    3636
     37#include <sys/socket.h>
     38#include <sys/ioctl.h>
     39#include <netdb.h>
     40#include <netinet/in.h>
     41#include <netinet/tcp.h>
     42#undef interface
     43#include <net/if.h>
     44#include <netinet/if_ether.h>
     45#include <nerrno.h>
     46#include <sys/time.h>
     47
     48#ifndef TCPV40HDRS
    3749#define TCPV40HDRS
     50#endif
    3851#include "rpcrt4.h"
    3952#include "uuidp.h"
    4053
    4154#include "io.h"
    42 #include "sys\timeb.h"
    43 
    44 #include <sys\socket.h>
    45 #include <sys\ioctl.h>
    46 #include <netdb.h>
    47 #include <netinet\in.h>
    48 #include <netinet\tcp.h>
    49 #undef interface
    50 #include <net\if.h>
    51 #include <netinet\if_ether.h>
    52 #include <nerrno.h>
    53 #include <sys\time.h>
     55#include "sys/timeb.h"
    5456
    5557ULONG WINAPI RtlExtendedIntegerMultiply(LARGE_INTEGER factor1, INT factor2);
Note: See TracChangeset for help on using the changeset viewer.