From 300c1eb6d37d46078d448d6d58938d5a80cd68ff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Apr 2014 21:46:20 +0000 Subject: (tl)perl 5.18.2 for windows from siep git-svn-id: svn://tug.org/texlive/trunk@33648 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/tlperl/lib/CORE/win32.h | 111 +++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 44 deletions(-) (limited to 'Master/tlpkg/tlperl/lib/CORE/win32.h') diff --git a/Master/tlpkg/tlperl/lib/CORE/win32.h b/Master/tlpkg/tlperl/lib/CORE/win32.h index e906266a4ad..3065867bd28 100644 --- a/Master/tlpkg/tlperl/lib/CORE/win32.h +++ b/Master/tlpkg/tlperl/lib/CORE/win32.h @@ -13,6 +13,38 @@ # define _WIN32_WINNT 0x0500 /* needed for CreateHardlink() etc. */ #endif +#ifdef PERL_IS_MINIPERL +/* this macro will remove Winsock only on miniperl, PERL_IMPLICIT_SYS and + * makedef.pl create dependencies that will keep Winsock linked in even with + * this macro defined, even though sockets will be umimplemented from a script + * level in full perl + */ +# define WIN32_NO_SOCKETS +#endif + +#ifdef WIN32_NO_SOCKETS +# undef HAS_SOCKET +# undef HAS_GETPROTOBYNAME +# undef HAS_GETPROTOBYNUMBER +# undef HAS_GETPROTOENT +# undef HAS_GETNETBYNAME +# undef HAS_GETNETBYADDR +# undef HAS_GETNETENT +# undef HAS_GETSERVBYNAME +# undef HAS_GETSERVBYPORT +# undef HAS_GETSERVENT +# undef HAS_GETHOSTBYNAME +# undef HAS_GETHOSTBYADDR +# undef HAS_GETHOSTENT +# undef HAS_SELECT +# undef HAS_IOCTL +# undef HAS_NTOHL +# undef HAS_HTONL +# undef HAS_HTONS +# undef HAS_NTOHS +# define WIN32SCK_IS_STDSCK +#endif + #if defined(PERL_IMPLICIT_SYS) # define DYNAMIC_ENV_FETCH # define HAS_GETENV_LEN @@ -46,12 +78,15 @@ */ /* now even GCC supports __declspec() */ - -#if defined(PERLDLL) -#define DllExport -/*#define DllExport __declspec(dllexport)*/ /* noises with VC5+sp3 */ +/* miniperl has no reason to export anything */ +#if defined(PERL_IS_MINIPERL) && !defined(UNDER_CE) && defined(_MSC_VER) +# define DllExport #else -#define DllExport __declspec(dllimport) +# if defined(PERLDLL) +# define DllExport __declspec(dllexport) +# else +# define DllExport __declspec(dllimport) +# endif #endif /* The Perl APIs can only be called directly inside the perl5xx.dll. @@ -66,11 +101,26 @@ #if !defined(PERLDLL) && !defined(PERL_EXT_RE_BUILD) # ifdef __cplusplus # define PERL_CALLCONV extern "C" __declspec(dllimport) +# ifdef _MSC_VER +# define PERL_CALLCONV_NO_RET extern "C" __declspec(dllimport) __declspec(noreturn) +# endif # else # define PERL_CALLCONV __declspec(dllimport) +# ifdef _MSC_VER +# define PERL_CALLCONV_NO_RET __declspec(dllimport) __declspec(noreturn) +# endif +# endif +#else /* MSVC noreturn support inside the interp */ +# ifdef _MSC_VER +# define PERL_CALLCONV_NO_RET __declspec(noreturn) # endif #endif +#ifdef _MSC_VER +# define PERL_STATIC_NO_RET __declspec(noreturn) static +# define PERL_STATIC_INLINE_NO_RET __declspec(noreturn) PERL_STATIC_INLINE +#endif + #define WIN32_LEAN_AND_MEAN #include @@ -147,34 +197,18 @@ struct utsname { #define DOSISH 1 /* no escaping our roots */ #define OP_BINARY O_BINARY /* mistake in in pp_sys.c? */ -/* Define USE_SOCKETS_AS_HANDLES to enable emulation of windows sockets as - * real filehandles. XXX Should always be defined (the other version is untested) */ -#define USE_SOCKETS_AS_HANDLES - /* read() and write() aren't transparent for socket handles */ -#define PERL_SOCK_SYSREAD_IS_RECV -#define PERL_SOCK_SYSWRITE_IS_SEND +#ifndef WIN32_NO_SOCKETS +# define PERL_SOCK_SYSREAD_IS_RECV +# define PERL_SOCK_SYSWRITE_IS_SEND +#endif #define PERL_NO_FORCE_LINK /* no need for PL_force_link_funcs */ -/* Define PERL_WIN32_SOCK_DLOAD to have Perl dynamically load the winsock - DLL when needed. Don't use if your compiler supports delayloading (ie, VC++ 6.0) - -- BKS 5-29-2000 */ -#if !(defined(_M_IX86) && _MSC_VER >= 1200) -#define PERL_WIN32_SOCK_DLOAD -#endif #define ENV_IS_CASELESS #define PIPESOCK_MODE "b" /* pipes, sockets default to binmode */ -#ifndef VER_PLATFORM_WIN32_WINDOWS /* VC-2.0 headers don't have this */ -#define VER_PLATFORM_WIN32_WINDOWS 1 -#endif - -#ifndef FILE_SHARE_DELETE /* VC-4.0 headers don't have this */ -#define FILE_SHARE_DELETE 0x00000004 -#endif - /* access() mode bits */ #ifndef R_OK # define R_OK 4 @@ -192,13 +226,11 @@ struct utsname { /* Compiler-specific stuff. */ -#if defined(_MSC_VER) || defined(__MINGW32__) /* VC uses non-standard way to determine the size and alignment if bit-fields */ -/* MinGW will compiler with -mms-bitfields, so should use the same types */ -# define PERL_BITFIELD8 unsigned char -# define PERL_BITFIELD16 unsigned short -# define PERL_BITFIELD32 unsigned int -#endif +/* MinGW will compile with -mms-bitfields, so should use the same types */ +#define PERL_BITFIELD8 unsigned char +#define PERL_BITFIELD16 unsigned short +#define PERL_BITFIELD32 unsigned int #ifdef _MSC_VER /* Microsoft Visual C++ */ @@ -210,9 +242,6 @@ typedef unsigned short mode_t; #pragma warning(disable: 4102) /* "unreferenced label" */ -/* Visual C thinks that a pointer to a member variable is 16 bytes in size. */ -#define PERL_MEMBER_PTR_SIZE 16 - #define isnan _isnan #define snprintf _snprintf #define vsnprintf _vsnprintf @@ -255,14 +284,11 @@ typedef long gid_t; # endif #endif -#endif /* __MINGW32__ */ - -/* both GCC/Mingw32 and MSVC++ 4.0 are missing this, so we put it here */ #ifndef CP_UTF8 # define CP_UTF8 65001 #endif -/* compatibility stuff for other compilers goes here */ +#endif /* __MINGW32__ */ #ifndef _INTPTR_T_DEFINED typedef int intptr_t; @@ -278,6 +304,7 @@ START_EXTERN_C /* For UNIX compatibility. */ +#ifdef PERL_CORE extern uid_t getuid(void); extern gid_t getgid(void); extern uid_t geteuid(void); @@ -293,6 +320,7 @@ extern void *sbrk(ptrdiff_t need); extern char * getlogin(void); extern int chown(const char *p, uid_t o, gid_t g); extern int mkstemp(const char *path); +#endif #undef Stat #define Stat win32_stat @@ -332,9 +360,6 @@ typedef struct { DllExport void win32_get_child_IO(child_IO_table* ptr); DllExport HWND win32_create_message_window(void); -#ifndef USE_SOCKETS_AS_HANDLES -extern FILE * my_fdopen(int, char *); -#endif extern int my_fclose(FILE *); extern char * win32_get_privlib(const char *pl, STRLEN *const len); extern char * win32_get_sitelib(const char *pl, STRLEN *const len); @@ -344,7 +369,7 @@ extern char * win32_get_vendorlib(const char *pl, STRLEN *const len); extern void win32_delete_internal_host(void *h); #endif -extern char * staticlinkmodules[]; +extern const char * const staticlinkmodules[]; END_EXTERN_C @@ -387,9 +412,7 @@ struct thread_intern { char Wstrerror_buffer[512]; struct servent Wservent; char Wgetlogin_buffer[128]; -# ifdef USE_SOCKETS_AS_HANDLES int Winit_socktype; -# endif char Wcrypt_buffer[30]; # ifdef USE_RTL_THREAD_API void * retv; /* slot for thread return value */ -- cgit v1.2.3