Changeset 361

Timestamp:

Jul 11, 2003, 5:25:48 PM (22 years ago)

Author:

bird

Message:

#427: Some prototype changes because of unistd.h update.

Location:

trunk/src/emx/include

Files:

• io.h (modified) (6 diffs, 1 prop)
• stdlib.h (modified) (6 diffs, 1 prop)

trunk/src/emx/include/io.h

@@ -8 +8 @@
 #endif
 
-#if !defined (_SIZE_T)
-#define _SIZE_T
-typedef unsigned long size_t;
+#include <sys/_types.h>
+
+#if !defined(_SIZE_T_DECLARED) && !defined(_SIZE_T) /* bird: emx */
+typedef __size_t        size_t;
+#define _SIZE_T_DECLARED
+#define _SIZE_T                         /* bird: emx */
+#endif
+
+#if !defined(_SSIZE_T_DECLARED) && !defined(_SSIZE_T) /* bird: emx */
+typedef __ssize_t       ssize_t;
+#define _SSIZE_T_DECLARED
+#define _SSIZE_T                        /* bird: emx */
+#endif
+
+#if !defined(_OFF_T_DECLARED) && !defined(_OFF_T) /* bird:emx */
+typedef __off_t         off_t;          /* file offset */
+#define _OFF_T_DECLARED
+#define _OFF_T                          /* bird: emx */
 #endif
 
@@ -39 +54 @@
 #ifndef _FTRUNCATE_DECLARED
 #define _FTRUNCATE_DECLARED
-int ftruncate (int, long);
+int      ftruncate(int, off_t);
 #endif
 int ioctl (int, unsigned long request, ...);
@@ -45 +60 @@
 #ifndef _LSEEK_DECLARED
 #define _LSEEK_DECLARED
-long lseek (int, long, int);
+off_t    lseek(int, off_t, int);
 #endif
 int mkstemp (char *);
@@ -51 +66 @@
 int open (__const__ char *, int, ...);
 int pipe (int *);
-int read (int, void *, size_t);
+ssize_t read (int, void *, size_t);
 int select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
 int setmode (int, int);
@@ -57 +72 @@
 int stat (__const__ char *, struct stat *);
 long tell (int);
-#ifndef _LSEEK_DECLARED
-#define _LSEEK_DECLARED
-int truncate (char *, long);
+#ifndef _TRUNCATE_DECLARED
+#define _TRUNCATE_DECLARED
+int      truncate(const char *, off_t);
 #endif
 int umask (int);
@@ -77 +92 @@
 int _fstat (int, struct stat *);
 int _fsync (int);
-int _ftruncate (int, long);
+#ifndef __FTRUNCATE_DECLARED
+#define __FTRUNCATE_DECLARED
+int      _ftruncate(int, off_t);
+#endif
 int _imphandle (int);
 int _ioctl (int, unsigned long request, ...);
 int _isatty (int);
 int _isterm (int);
-long _lseek (int, long, int);
+#ifndef __LSEEK_DECLARED
+#define __LSEEK_DECLARED
+off_t    _lseek(int, off_t, int);
+#endif
 int _mkstemp (char *);
 char *_mktemp (char *);
 int _open (__const__ char *, int, ...);
 int _pipe (int *);
-int _read (int, void *, size_t);
+ssize_t _read (int, void *, size_t);
 int _seek_hdr (int);
 int _select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);

trunk/src/emx/include/stdlib.h

@@ -7 +7 @@
 extern "C" {
 #endif
+
+#include <sys/_types.h>
 
 #if !defined (_SIZE_T)
@@ -16 +18 @@
 #define _WCHAR_T
 typedef unsigned short wchar_t;
+#endif
+
+#ifndef _INTPTR_T_DECLARED
+typedef __intptr_t      intptr_t;
+typedef __uintptr_t     uintptr_t;
+#define _INTPTR_T_DECLARED
 #endif
 
@@ -151 +159 @@
 
 unsigned alarm (unsigned);
-void *brk (void *);
+int      brk(const void *);
 int chdir (__const__ char *);
 char *gcvt (double, int, char *);
@@ -161 +169 @@
 int putenv (__const__ char *);
 int rmdir (__const__ char *);
-void *sbrk (int);
+void    *sbrk(intptr_t);
 unsigned sleep (unsigned);
 void swab (__const__ void *, void *, size_t);
@@ -184 +192 @@
 
 unsigned _alarm (unsigned);
-void *_brk (void *);
+int      _brk(const void *);
 int _chdir (__const__ char *);
 char *_gcvt (double, int, char *);
@@ -193 +201 @@
 int _putenv (__const__ char *);
 int _rmdir (__const__ char *);
-void *_sbrk (int);
+void     *_sbrk(intptr_t);
 unsigned _sleep (unsigned);
 void _swab (__const__ void *, void *, size_t);