X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=a6a2f9d5c5f7013f9e8ce50084edc8989e54310d;hb=3e83fff7485ec2aa4f013e05fa43596a76f92102;hp=ceee4fe8b66afe809200a7aa597c06ab0a6e730f;hpb=ab39fa9dbf3b1a1fb7beb555653d0558a089397f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32.h b/win32/win32.h index ceee4fe..a6a2f9d 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -14,7 +14,7 @@ # ifdef PERL_GLOBAL_STRUCT # error PERL_GLOBAL_STRUCT cannot be defined with PERL_OBJECT # endif -# define win32_get_stdlib PerlEnv_lib_path +# define win32_get_privlib PerlEnv_lib_path # define win32_get_sitelib PerlEnv_sitelib_path #endif @@ -46,7 +46,8 @@ typedef long long __int64; #define DllExport #else #if defined(PERLDLL) || defined(WIN95FIX) -#define DllExport __declspec(dllexport) +#define DllExport +/*#define DllExport __declspec(dllexport)*/ /* noises with VC5+sp3 */ #else #define DllExport __declspec(dllimport) #endif @@ -57,7 +58,6 @@ typedef long long __int64; #ifdef WIN32_LEAN_AND_MEAN /* C file is NOT a Perl5 original. */ #define CONTEXT PERL_CONTEXT /* Avoid conflict of CONTEXT defs. */ -#define index strchr /* Why 'index'? */ #endif /*WIN32_LEAN_AND_MEAN */ #include @@ -213,7 +213,7 @@ extern int do_aspawn(void *really, void **mark, void **sp); extern int do_spawn(char *cmd); extern int do_spawn_nowait(char *cmd); extern char do_exec(char *cmd); -extern char * win32_get_stdlib(char *pl); +extern char * win32_get_privlib(char *pl); extern char * win32_get_sitelib(char *pl); extern int IsWin95(void); extern int IsWinNT(void);