improve open.pm layer class error message

[perl5.git] / win32 / win32iop.h

diff --git a/win32/win32iop.h b/win32/win32iop.h
index e835b2e..9c59037 100644 (file)
--- a/win32/win32iop.h
+++ b/win32/win32iop.h
@@ -67,6 +67,7 @@ DllExport  int                win32_fseek(FILE *pf,Off_t offset,int origin);
 DllExport  int         win32_fgetpos(FILE *pf,fpos_t *p);
 DllExport  int         win32_fsetpos(FILE *pf,const fpos_t *p);
 DllExport  void                win32_rewind(FILE *pf);
+DllExport  int         win32_tmpfd(void);
 DllExport  FILE*       win32_tmpfile(void);
 DllExport  void                win32_abort(void);
 DllExport  int         win32_fstat(int fd,Stat_t *sbufptr);
@@ -85,6 +86,7 @@ DllExport  int                win32_dup2(int h1, int h2);
 DllExport  int         win32_open(const char *path, int oflag,...);
 DllExport  int         win32_close(int fd);
 DllExport  int         win32_eof(int fd);
+DllExport  int         win32_isatty(int fd);
 DllExport  int         win32_read(int fd, void *buf, unsigned int cnt);
 DllExport  int         win32_write(int fd, const void *buf, unsigned int cnt);
 DllExport  int         win32_spawnvp(int mode, const char *cmdname,
@@ -116,7 +118,7 @@ DllExport  int              win32_open_osfhandle(intptr_t handle, int flags);
 DllExport  intptr_t    win32_get_osfhandle(int fd);
 DllExport  FILE*       win32_fdupopen(FILE *pf);
 
-DllExport  DIR*                win32_opendir(char *filename);
+DllExport  DIR*                win32_opendir(const char *filename);
 DllExport  struct direct*      win32_readdir(DIR *dirp);
 DllExport  long                win32_telldir(DIR *dirp);
 DllExport  void                win32_seekdir(DIR *dirp, long loc);
@@ -131,6 +133,7 @@ DllExport  int              win32_times(struct tms *timebuf);
 DllExport  unsigned    win32_alarm(unsigned int sec);
 DllExport  int         win32_stat(const char *path, Stat_t *buf);
 DllExport  char*       win32_longpath(char *path);
+DllExport  char*       win32_ansipath(const WCHAR *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);
@@ -159,7 +162,9 @@ DllExport Sighandler_t      win32_signal(int sig, Sighandler_t subcode);
 END_EXTERN_C
 
 #undef alarm
-#define alarm                  win32_alarm
+#define alarm                          win32_alarm
+#undef strerror
+#define strerror                       win32_strerror
 
 /*
  * the following six(6) is #define in stdio.h
@@ -190,6 +195,9 @@ END_EXTERN_C
 #undef putc
 #undef getchar
 #undef putchar
+#endif
+
+#if defined(__MINGW32__) || defined(__BORLANDC__)
 #undef fileno
 #endif
 
@@ -200,7 +208,6 @@ END_EXTERN_C
 #define ferror(f)                      win32_ferror(f)
 #define errno                          (*win32_errno())
 #define environ                                (*win32_environ())
-#define strerror                       win32_strerror
 
 /*
  * redirect to our own version
@@ -235,6 +242,7 @@ END_EXTERN_C
 #define fstat(fd,bufptr)       win32_fstat(fd,bufptr)
 #define stat(pth,bufptr)       win32_stat(pth,bufptr)
 #define longpath(pth)          win32_longpath(pth)
+#define ansipath(pth)          win32_ansipath(pth)
 #define rename(old,new)                win32_rename(old,new)
 #define setmode(fd,mode)       win32_setmode(fd,mode)
 #define chsize(fd,sz)          win32_chsize(fd,sz)
@@ -245,6 +253,7 @@ END_EXTERN_C
 #define open                   win32_open
 #define close(fd)              win32_close(fd)
 #define eof(fd)                        win32_eof(fd)
+#define isatty(fd)             win32_isatty(fd)
 #define read(fd,b,s)           win32_read(fd,b,s)
 #define write(fd,b,s)          win32_write(fd,b,s)
 #define _open_osfhandle                win32_open_osfhandle
@@ -288,6 +297,10 @@ END_EXTERN_C
 #define free                   win32_free
 #endif
 
+/* XXX Why are APIs like sleep(), times() etc. inside a block
+ * XXX guarded by "#ifndef WIN32IO_IS_STDIO"?
+ */
+
 #define pipe(fd)               win32_pipe((fd), 512, O_BINARY)
 #define pause()                        win32_sleep((32767L << 16) + 32767)
 #define sleep                  win32_sleep