Monster _r patch: try to scan for all known _r variants,

[perl5.git] / win32 / win32iop.h

diff --git a/win32/win32iop.h b/win32/win32iop.h
index cf2bd75..6ddafa5 100644 (file)
--- a/win32/win32iop.h
+++ b/win32/win32iop.h
@@ -7,8 +7,8 @@
 #  define END_EXTERN_C }
 #  define EXTERN_C extern "C"
 #else
-#  define START_EXTERN_C 
-#  define END_EXTERN_C 
+#  define START_EXTERN_C
+#  define END_EXTERN_C
 #  define EXTERN_C
 #endif
 #endif
@@ -72,8 +72,9 @@ DllExport  void               win32_abort(void);
 DllExport  int         win32_fstat(int fd,struct stat *sbufptr);
 DllExport  int         win32_stat(const char *name,struct stat *sbufptr);
 DllExport  int         win32_pipe( int *phandles, unsigned int psize, int textmode );
-DllExport  FILE*       win32_popen( const char *command, const char *mode );
-DllExport  int         win32_pclose( FILE *pf);
+DllExport  PerlIO*     win32_popen( const char *command, const char *mode );
+DllExport  PerlIO*     win32_popenlist(const char *mode, IV narg, SV **args);
+DllExport  int         win32_pclose( PerlIO *pf);
 DllExport  int         win32_rename( const char *oname, const char *newname);
 DllExport  int         win32_setmode( int fd, int mode);
 DllExport  long                win32_lseek( int fd, long offset, int origin);
@@ -113,26 +114,50 @@ DllExport  void           win32_free(void *block);
 DllExport  int         win32_open_osfhandle(long handle, int flags);
 DllExport  long                win32_get_osfhandle(int fd);
 
-#ifndef USE_WIN32_RTL_ENV
+DllExport  DIR*                win32_opendir(char *filename);
+DllExport  struct direct*      win32_readdir(DIR *dirp);
+DllExport  long                win32_telldir(DIR *dirp);
+DllExport  void                win32_seekdir(DIR *dirp, long loc);
+DllExport  void                win32_rewinddir(DIR *dirp);
+DllExport  int         win32_closedir(DIR *dirp);
+
 DllExport  char*       win32_getenv(const char *name);
-#endif
+DllExport  int         win32_putenv(const char *name);
 
 DllExport  unsigned    win32_sleep(unsigned int);
 DllExport  int         win32_times(struct tms *timebuf);
 DllExport  unsigned    win32_alarm(unsigned int sec);
 DllExport  int         win32_stat(const char *path, struct stat *buf);
+DllExport  char*       win32_longpath(char *path);
 DllExport  int         win32_ioctl(int i, unsigned int u, char *data);
+DllExport  int          win32_link(const char *oldname, const char *newname);
+DllExport  int         win32_unlink(const char *f);
 DllExport  int         win32_utime(const char *f, struct utimbuf *t);
+DllExport  int         win32_uname(struct utsname *n);
 DllExport  int         win32_wait(int *status);
 DllExport  int         win32_waitpid(int pid, int *status, int flags);
 DllExport  int         win32_kill(int pid, int sig);
+DllExport  unsigned long       win32_os_id(void);
+DllExport  void*       win32_dynaload(const char*filename);
+DllExport  int         win32_access(const char *path, int mode);
+DllExport  int         win32_chmod(const char *path, int mode);
+DllExport  int         win32_getpid(void);
 
-#ifdef HAVE_DES_FCRYPT
 DllExport char *       win32_crypt(const char *txt, const char *salt);
-#endif
+
+DllExport void *       win32_get_childenv(void);
+DllExport void         win32_free_childenv(void* d);
+DllExport void         win32_clearenv(void);
+DllExport char *       win32_get_childdir(void);
+DllExport void         win32_free_childdir(char* d);
+DllExport Sighandler_t win32_signal(int sig, Sighandler_t subcode);
+
 
 END_EXTERN_C
 
+#undef alarm
+#define alarm                  win32_alarm
+
 /*
  * the following six(6) is #define in stdio.h
  */
@@ -149,9 +174,10 @@ END_EXTERN_C
 #undef pause
 #undef sleep
 #undef times
-#undef alarm
 #undef ioctl
+#undef unlink
 #undef utime
+#undef uname
 #undef wait
 
 #ifdef __BORLANDC__
@@ -204,6 +230,7 @@ END_EXTERN_C
 #define abort()                        win32_abort()
 #define fstat(fd,bufptr)       win32_fstat(fd,bufptr)
 #define stat(pth,bufptr)       win32_stat(pth,bufptr)
+#define longpath(pth)          win32_longpath(pth)
 #define rename(old,new)                win32_rename(old,new)
 #define setmode(fd,mode)       win32_setmode(fd,mode)
 #define lseek(fd,offset,orig)  win32_lseek(fd,offset,orig)
@@ -241,6 +268,9 @@ END_EXTERN_C
 #define getchar                        win32_getchar
 #undef putchar
 #define putchar                        win32_putchar
+#define access(p,m)            win32_access(p,m)
+#define chmod(p,m)             win32_chmod(p,m)
+
 
 #if !defined(MYMALLOC) || !defined(PERL_CORE)
 #undef malloc
@@ -257,9 +287,11 @@ END_EXTERN_C
 #define pause()                        win32_sleep((32767L << 16) + 32767)
 #define sleep                  win32_sleep
 #define times                  win32_times
-#define alarm                  win32_alarm
 #define ioctl                  win32_ioctl
+#define link                   win32_link
+#define unlink                 win32_unlink
 #define utime                  win32_utime
+#define uname                  win32_uname
 #define wait                   win32_wait
 #define waitpid                        win32_waitpid
 #define kill                   win32_kill
@@ -270,17 +302,27 @@ END_EXTERN_C
 #define seekdir                        win32_seekdir
 #define rewinddir              win32_rewinddir
 #define closedir               win32_closedir
+#define os_id                  win32_os_id
+#define getpid                 win32_getpid
 
-#ifdef HAVE_DES_FCRYPT
 #undef crypt
-#define crypt                  win32_crypt
-#endif
+#define crypt(t,s)             win32_crypt(t,s)
+
+#undef get_childenv
+#undef free_childenv
+#undef clearenv
+#undef get_childdir
+#undef free_childdir
+#define get_childenv()         win32_get_childenv()
+#define free_childenv(d)       win32_free_childenv(d)
+#define clearenv()             win32_clearenv()
+#define get_childdir()         win32_get_childdir()
+#define free_childdir(d)       win32_free_childdir(d)
 
-#ifndef USE_WIN32_RTL_ENV
 #undef getenv
 #define getenv win32_getenv
-#endif
+#undef putenv
+#define putenv win32_putenv
 
 #endif /* WIN32IO_IS_STDIO */
 #endif /* WIN32IOP_H */
-