perl.h: Add EXTERN_C for flock()

[perl5.git] / iperlsys.h

diff --git a/iperlsys.h b/iperlsys.h
index 57160e0..d4ecb73 100644 (file)
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -50,11 +50,14 @@
 */
 #include "perlio.h"
 
+typedef Signal_t (*Sighandler1_t) (int);
+typedef Signal_t (*Sighandler3_t) (int, Siginfo_t*, void*);
+
 #ifndef Sighandler_t
-#  if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
-typedef Signal_t (*Sighandler_t) (int, siginfo_t*, void*);
+#  ifdef PERL_USE_3ARG_SIGHANDLER
+typedef Sighandler3_t Sighandler_t;
 #  else
-typedef Signal_t (*Sighandler_t) (int);
+typedef Sighandler1_t Sighandler_t;
 #  endif
 #endif
 
@@ -478,7 +481,7 @@ typedef char*               (*LPENVGetenv_len)(struct IPerlEnv*,
 #endif
 #ifdef WIN32
 typedef unsigned long  (*LPEnvOsID)(struct IPerlEnv*);
-typedef char*          (*LPEnvLibPath)(struct IPerlEnv*, const char*,
+typedef char*          (*LPEnvLibPath)(struct IPerlEnv*, WIN32_NO_REGISTRY_M_(const char*)
                                        STRLEN *const len);
 typedef char*          (*LPEnvSiteLibPath)(struct IPerlEnv*, const char*,
                                            STRLEN *const len);
@@ -550,7 +553,7 @@ struct IPerlEnvInfo
 #define PerlEnv_os_id()                                                \
        (*PL_Env->pEnvOsID)(PL_Env)
 #define PerlEnv_lib_path(str, lenp)                            \
-       (*PL_Env->pLibPath)(PL_Env,(str),(lenp))
+       (*PL_Env->pLibPath)(PL_Env,WIN32_NO_REGISTRY_M_(str)(lenp))
 #define PerlEnv_sitelib_path(str, lenp)                                \
        (*PL_Env->pSiteLibPath)(PL_Env,(str),(lenp))
 #define PerlEnv_vendorlib_path(str, lenp)                      \
@@ -575,7 +578,7 @@ struct IPerlEnvInfo
 
 #ifdef WIN32
 #define PerlEnv_os_id()                        win32_os_id()
-#define PerlEnv_lib_path(str, lenp)    win32_get_privlib(str, lenp)
+#define PerlEnv_lib_path(str, lenp)    win32_get_privlib(WIN32_NO_REGISTRY_M_(str) lenp)
 #define PerlEnv_sitelib_path(str, lenp)        win32_get_sitelib(str, lenp)
 #define PerlEnv_vendorlib_path(str, lenp)      win32_get_vendorlib(str, lenp)
 #define PerlEnv_get_child_IO(ptr)      win32_get_child_IO(ptr)
@@ -600,6 +603,8 @@ struct IPerlEnvInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
+struct utimbuf; /* prevent gcc warning about the use below */
+
 /* IPerlLIO            */
 struct IPerlLIO;
 struct IPerlLIOInfo;
@@ -758,7 +763,6 @@ struct IPerlLIOInfo
 #  define PerlLIO_lstat(name, buf)     PerlLIO_stat((name), (buf))
 #endif
 #define PerlLIO_mktemp(file)           mktemp((file))
-#define PerlLIO_mkstemp(file)          mkstemp((file))
 #define PerlLIO_open(file, flag)       open((file), (flag))
 #define PerlLIO_open3(file, flag, perm)        open((file), (flag), (perm))
 #define PerlLIO_read(fd, buf, count)   read((fd), (buf), (count))