Changeset 3188 for trunk/essentials/dev-lang/perl/os2/os2ish.h

Timestamp:

Apr 22, 2007, 10:57:48 AM (18 years ago)

Author:

bird

Message:

Applied patch from Paul (aka Creeping).

File:

• trunk/essentials/dev-lang/perl/os2/os2ish.h (modified) (11 diffs)

trunk/essentials/dev-lang/perl/os2/os2ish.h

@@ -23 +23 @@
 #define HAS_WAIT
 #define HAS_DLERROR
+#ifndef __KLIBC__
 #define HAS_WAITPID_RUNTIME (_emx_env & 0x200)
+#else
+#define HAS_WAITPID_RUNTIME 1
+#endif
 
 /* HAS_PASSWD
@@ -314 +318 @@
 FILE *my_tmpfile (void);
 char *my_tmpnam (char *);
+#ifndef __KLIBC__
 int my_mkdir (__const__ char *, long);
+#endif
 int my_rmdir (__const__ char *);
 struct passwd *my_getpwent (void);
@@ -348 +354 @@
 #endif
 
+#ifndef __KLIBC__
 struct group *getgrent (void);
 void setgrent (void);
 void endgrent (void);
-
+#endif
 struct passwd *my_getpwuid (uid_t);
 struct passwd *my_getpwnam (__const__ char *);
@@ -395 +402 @@
 
 #include <stdlib.h>     /* before the following definitions */
+#ifndef __KLIBC__
 #include <unistd.h>     /* before the following definitions */
+#endif
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -411 +420 @@
 #endif
 
+#ifndef __KLIBC__
 #define PERLIO_IS_BINMODE_FD(fd) _PERLIO_IS_BINMODE_FD(fd)
+#endif
 
 #ifdef __GNUG__
@@ -422 +433 @@
 
 #include <emx/io.h> /* for _fd_flags() prototype */
-
+#ifndef __KLIBC__
 static inline bool
 _PERLIO_IS_BINMODE_FD(int fd)
@@ -430 +441 @@
     return pflags && (*pflags) & O_BINARY;
 }
-
+#endif
 /* ctermid is missing from emx0.9d */
 char *ctermid(char *s);
@@ -536 +547 @@
 #define OS2_XS_init() (*OS2_Perl_data.xs_init)(aTHX)
 
-#if _EMX_CRT_REV_ >= 60
+#ifndef __KLIBC__
+#if (_EMX_CRT_REV_ >= 60)
 # define os2_setsyserrno(rc)    (Perl_rc = rc, errno = errno_isOS2_set, \
                                 _setsyserrno(rc))
@@ -542 +554 @@
 # define os2_setsyserrno(rc)    (Perl_rc = rc, errno = errno_isOS2)
 #endif
+#else
+# define os2_setsyserrno(rc)    (Perl_rc = rc, errno = errno_isOS2)
+#endif /* __KLIBC__ */
 
 /* The expressions below return true on error. */
@@ -781 +796 @@
 my_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
 {
+#ifndef __KLIBC__
   if (nfds == 0 && timeout && (_emx_env & 0x200)) {
+#else
+  if (nfds == 0 && timeout) {
+#endif
     if (async_mssleep(1000 * timeout->tv_sec + (timeout->tv_usec + 500)/1000, 500))
       return 0;
@@ -800 +819 @@
 int os2_stat(const char *name, struct stat *st);
 int fork_with_resources();
+#ifndef __KLIBC__
 int setpriority(int which, int pid, int val);
 int getpriority(int which /* ignored */, int pid);
+#endif
 
 void croak_with_os2error(char *s) __attribute__((noreturn));