diff options
| author | Yves Orton <demerphq@gmail.com> | 2006-05-01 21:02:09 +0200 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2006-05-02 14:28:31 +0000 |
| commit | f4257e4d90c288c896435eca90d56255a0334871 (patch) | |
| tree | a0ffec8a5f9406d9d6e66cfce6935231960dc3e5 /win32/include | |
| parent | f4890806d306bfeee79f1864c882eb307b4f54fd (diff) | |
| download | perl-f4257e4d90c288c896435eca90d56255a0334871.tar.gz | |
Re: Merge WinCE into Win32 directory and remove the the WinCE directory
Message-ID: <9b18b3110605011002m56c0db99n169ae677efb6d059@mail.gmail.com>
Plus adjustements to MANIFEST. Also, perlmain.c seemed to be missing
from the patch.
p4raw-id: //depot/perl@28061
Diffstat (limited to 'win32/include')
| -rw-r--r-- | win32/include/sys/socket.h | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h index e13e872fe1..a3c53b0e88 100644 --- a/win32/include/sys/socket.h +++ b/win32/include/sys/socket.h @@ -10,54 +10,22 @@ extern "C" { #endif -#ifndef _WINCE - #define WIN32_LEAN_AND_MEAN #ifdef __GNUC__ # define Win32_Winsock #endif #include <windows.h> -#else -/*_WINCE*/ -#ifndef FAR -#define FAR -#endif - -#define PASCAL __stdcall -#define WINAPI __stdcall - -#undef WORD -typedef int BOOL; -typedef unsigned short WORD; -typedef void* HANDLE; -typedef void* HWND; -typedef int (FAR WINAPI *FARPROC)(); - -typedef unsigned long DWORD; -typedef void *PVOID; - -#define IN -#define OUT - -#ifndef UNDER_CE -typedef struct _OVERLAPPED { - DWORD Internal; - DWORD InternalHigh; - DWORD Offset; - DWORD OffsetHigh; - HANDLE hEvent; -} OVERLAPPED, *LPOVERLAPPED; -#endif - -#undef HOST_NOT_FOUND - -#endif /*_WINCE*/ /* Too late to include winsock2.h if winsock.h has already been loaded */ #ifndef _WINSOCKAPI_ +# if defined(UNDER_CE) && UNDER_CE <= 300 + /* winsock2 only for 4.00+ */ +# include <winsock.h> +# else # include <winsock2.h> #endif +#endif #include "win32.h" |