Changeset 190 for trunk/src

Timestamp:

May 19, 2003, 5:52:55 PM (22 years ago)

Author:

bird

Message:

#434: declaration fixes.

Location:

trunk/src/emx

Files:

• include/emx/syscalls.h (modified) (1 diff, 1 prop)
• include/io.h (modified) (5 diffs, 1 prop)
• include/sys/ioccom.h (modified) (1 diff, 1 prop)
• include/sys/time.h (modified) (1 diff, 1 prop)
• src/lib/sys/__ioctl2.c (modified) (1 diff, 1 prop)

trunk/src/emx/include/emx/syscalls.h

@@ -173 +173 @@
 int __initthread (void *preg);
 int __ioctl1 (int handle, int code);
-int __ioctl2 (int handle, int request, int arg);
+int __ioctl2 (int handle, unsigned long request, int arg);
 int __kill (int pid, int sig);
 int __listen (int handle, int backlog);

trunk/src/emx/include/io.h

@@ -20 +20 @@
 
 struct stat;
-struct _fd_set;
+struct fd_set;
 struct timeval;
 
@@ -38 +38 @@
 int fsync (int);
 int ftruncate (int, long);
-int ioctl (int, int request, ...);
+int ioctl (int, unsigned long request, ...);
 int isatty (int);
 long lseek (int, long, int);
@@ -46 +46 @@
 int pipe (int *);
 int read (int, void *, size_t);
-int select (int, struct _fd_set *, struct _fd_set *, struct _fd_set *,
-    struct timeval *);
+int select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
 int setmode (int, int);
 int sopen (__const__ char *, int, int, ...);
@@ -71 +70 @@
 int _ftruncate (int, long);
 int _imphandle (int);
-int _ioctl (int, int request, ...);
+int _ioctl (int, unsigned long request, ...);
 int _isatty (int);
 int _isterm (int);
@@ -81 +80 @@
 int _read (int, void *, size_t);
 int _seek_hdr (int);
-int _select (int, struct _fd_set *, struct _fd_set *, struct _fd_set *,
-    struct timeval *);
+int _select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
 int _setmode (int, int);
 int _sopen (__const__ char *, int, int, ...);

trunk/src/emx/include/sys/ioccom.h

@@ -95 +95 @@
 
 int                 ioctl __P((int, unsigned long, ...));
-int                 _ioctl __P((int, int, ...));
+int                 _ioctl __P((int, unsigned long, ...));
 __END_DECLS
 

trunk/src/emx/include/sys/time.h

@@ -163 +163 @@
 #define setitimer     tcpip40_setitimer
 /* @} */
-int     _System utimes (__const__ char *, __const__ struct timeval *);
-int     _System gettimeofday (struct timeval *, struct timezone *);
-int     _System settimeofday (__const__ struct timeval *, __const__ struct timezone *);
+/* These are libc functions so no _System convention. */
+int     utimes (__const__ char *, __const__ struct timeval *);
+int     gettimeofday (struct timeval *, struct timezone *);
+int     settimeofday (__const__ struct timeval *, __const__ struct timezone *);
 #ifndef TCPV40HDRS
 #include <sys/cdefs.h>

trunk/src/emx/src/lib/sys/__ioctl2.c

@@ -14 +14 @@
 #define __IOCLW(a) ((unsigned short)(a))
 
-int __ioctl2 (int handle, int request, int arg)
+int __ioctl2 (int handle, unsigned long request, int arg)
 {
   ULONG rc;