Changeset 1517 for trunk/src/emx/include

Timestamp:

Sep 19, 2004, 5:53:31 PM (21 years ago)

Author:

bird

Message:

Fixing warnings. -Znofork

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (2 diffs, 1 prop)
• error.h (modified) (2 diffs, 1 prop)
• os2thunk.h (modified) (2 diffs, 1 prop)
• string.h (modified) (4 diffs, 1 prop)
• sys/cdefs.h (modified) (1 diff, 1 prop)
• sys/ioccom.h (modified) (1 diff, 1 prop)
• unistd.h (modified) (1 diff, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -129 +129 @@
  * @returns -1 and errno on failure.
  * @param   paStatFs    Where to to store the statistics.
- * @parma   cStatFS     Number of structures the array pointed to by paStatFs can hold.
+ * @param   cStatFS     Number of structures the array pointed to by paStatFs can hold.
  * @param   fFlags      Flags, currently ignored.
  */
@@ -140 +140 @@
  */
 void __libc_Back_fsSync(void);
+
+/**
+ * Sets or change the unixroot of the current process.
+ *
+ * @returns 0 on success.
+ * @returns -1 and errno on failure.
+ * @param   pszNewRoot  The new root.
+ */
+int __libc_Back_fsChRoot(const char *pszNewRoot);
 
 /** @} */

trunk/src/emx/include/error.h

@@ -2 +2 @@
 /** @file
  * GLIBC v2.3.2
+ *
+ * @changed bird: shut up -Wundef.
  */
 
@@ -29 +31 @@
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (defined(__STRICT_ANSI__) && __STRICT_ANSI__) /* bird: shut up -Wundef */
 #  define __attribute__(Spec) /* empty */
 # endif

trunk/src/emx/include/os2thunk.h

@@ -16 +16 @@
 void *_libc_16to32 (_far16ptr ptr);
 
+typedef union _thunk_u
+{
+    void *pv;
+    unsigned short *pus;
+    unsigned long *pul;
+} _thunk_t;
+
 unsigned long _libc_thunk1 (void *args, void *fun);
 
 #define _THUNK_PASCAL_PROLOG(SIZE) \
-  ({ char _tb[(SIZE)+4]; void *_tp = _tb + sizeof (_tb); \
+  __extension__ ({ char _tb[(SIZE)+4]; _thunk_t _tu; _tu.pv  = _tb + sizeof (_tb); \
        *(unsigned long *)_tb = (SIZE);
 #define _THUNK_PASCAL_CHAR(ARG)     _THUNK_PASCAL_SHORT (ARG)
-#define _THUNK_PASCAL_SHORT(ARG)    (*--((unsigned short *)_tp) = (ARG))
-#define _THUNK_PASCAL_LONG(ARG)     (*--((unsigned long *)_tp) = (ARG))
+#define _THUNK_PASCAL_SHORT(ARG)    (*--_tu.pus = (ARG))
+#define _THUNK_PASCAL_LONG(ARG)     (*--_tu.pul = (ARG))
 #define _THUNK_PASCAL_FLAT(ARG)     _THUNK_PASCAL_LONG (_libc_32to16 (ARG))
 #define _THUNK_PASCAL_FAR16(ARG)    _THUNK_PASCAL_LONG (ARG)
@@ -31 +38 @@
 
 #define _THUNK_C_PROLOG(SIZE) \
-  ({ char _tb[(SIZE)+4]; void *_tp = _tb + sizeof (unsigned long); \
+  __extension__ ({ char _tb[(SIZE)+4]; _thunk_t _tu; _tu.pv = _tb + sizeof (unsigned long); \
        *(unsigned long *)_tb = (SIZE);
 #define _THUNK_C_CHAR(ARG)     _THUNK_C_SHORT (ARG)
-#define _THUNK_C_SHORT(ARG)    (*((unsigned short *)_tp)++ = (ARG))
-#define _THUNK_C_LONG(ARG)     (*((unsigned long *)_tp)++ = (ARG))
+#define _THUNK_C_SHORT(ARG)    (*_tu.pus++ = (ARG))
+#define _THUNK_C_LONG(ARG)     (*_tu.pul++ = (ARG))
 #define _THUNK_C_FLAT(ARG)     _THUNK_C_LONG (_libc_32to16 (ARG))
 #define _THUNK_C_FAR16(ARG)    _THUNK_C_LONG (ARG)

trunk/src/emx/include/string.h

@@ -98 +98 @@
 size_t   strlen(const char *);
 #if __BSD_VISIBLE
-/** @todo void   strmode(int, char *); */
+void     strmode(int, char *);
 #endif
 char    *strncat(char * __restrict, const char * __restrict, size_t);
@@ -116 +116 @@
 char    *strtok(char * __restrict, const char * __restrict);
 #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500
-/**@todo char   *strtok_r(char *, const char *, char **); */
+char    *strtok_r(char *, const char *, char **);
 #endif
 size_t   strxfrm(char * __restrict, const char * __restrict, size_t);
@@ -138 +138 @@
 char *  strset(char *, int);
 char *  strupr(char *);
-/* bird: Are we sure we actually want this stuff _here_ ? */
-extern char *__gnu_basename (const char *);
-#ifndef _LIBGEN_H
-#define basename __gnu_basename
-#endif
 #endif
 
@@ -168 +163 @@
 /* bird: GNU stuff - start */
 #ifdef __USE_GNU
+char    *basename(const char *);
 size_t   strnlen(const char *, size_t);
 void    *mempcpy(void *, const void *, size_t);
 char    *strndup(const char *, size_t);
 void    *memrchr(const void *, int, size_t);
+#define  memrchr(pach, ch, cch)     _memrchr(pach, ch, cch)
+int      strverscmp(const char *, const char *);
 
 size_t   __strnlen(const char *, size_t);
 void    *__mempcpy(void *, const void *, size_t);
 char    *__strndup(const char *, size_t);
+void    *_memrchr(const void *, int, size_t);
 void    *__memrchr(const void *, int, size_t);
-void    *_memrchr(const void *, int, size_t);
-
-#define memrchr(pach, ch, cch)    _memrchr(pach, ch, cch)
-#define __memrchr(pach, ch, cch)  _memrchr(pach, ch, cch)
+#define  __memrchr(pach, ch, cch)   _memrchr(pach, ch, cch)
+int      __strverscmp(const char *, const char *);
 
 #endif

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

@@ -171 +171 @@
  */
 #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if __STDC_VERSION__ < 199901
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 /* bird: check if not defined. (-pedantic) */
 #define __restrict
 #else

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

@@ -83 +83 @@
  */
 int         TCPCALL os2_ioctl __P((int, int, char *, int));
+/** Wrapper around the ioctl() interface of OS/2 BSD 4.3. */
+int         TCPCALL so_ioctl __P((int, unsigned long, ...));
 #else
-/** The v41+ BSD socket ioctl interface.
- * @remark sys based libc have separeate handle spaces for sockets and files
- *         therefore this socket specific call.
- */
+/** The v41+ BSD socket ioctl interface. */
 int         TCPCALL so_ioctl __P((int, unsigned long, ...));
 /** The v41+ OS/2 specific socket ioctl interface. */

trunk/src/emx/include/unistd.h

@@ -307 +307 @@
 #if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
 int      brk(const void *);
-/** @todo int    chroot(const char *); */
-/** @todo int    getdtablesize(void); */
+int      chroot(const char *);
+int      getdtablesize(void);
 int      getpagesize(void) __pure2;
 char    *getpass(const char *);