Changeset 1697 for trunk/src/emx/include

Timestamp:

Dec 3, 2004, 8:00:05 AM (21 years ago)

Author:

bird

Message:

imported FreeBSD 5.3 code and broke stuff.

Location:

trunk/src/emx/include

Files:

• ctype.h (modified) (2 diffs, 1 prop)
• dlfcn.h (modified) (3 diffs, 1 prop)
• regex.h (modified) (5 diffs, 1 prop)
• sys/_types.h (modified) (1 diff, 1 prop)
• unidef.h (modified) (1 diff, 1 prop)
• unistd.h (modified) (2 diffs, 1 prop)
• wchar.h (added)
• wctype.h (added)

trunk/src/emx/include/ctype.h

@@ -27 +27 @@
 
 #include <sys/cdefs.h>
-
-#if !defined(__InnoTekLIBC_locale_h__)
-__BEGIN_DECLS
-/**
- * Simplified Ctype structure for inline functions.
- */
-extern struct
-{
-    /** All uppercased characters. */
-    unsigned char   auchUpper[256];
-    /** All lowercased characters. */
-    unsigned char   auchLower[256];
-    /** Bit flags for every character (for isXXX() function series). */
-    unsigned short  ausfType[256];
-} __libc_GLocaleCtype;
-
-/**
- * Simplified Default Ctype structure for inline functions.
- */
-extern const struct
-{
-    /** Bit flags for every character (for isXXX() function series). */
-    unsigned short  ausfType[256];
-} __libc_GLocaleCtypeDefault;
-__END_DECLS
-#endif /* !__InnoTekLIBC_locale_h__ */
-
-
-/** Bit masks for the ausfType member of __libc_GLocaleCtype
- *  and __libc_GLocaleCtypeDefault
- *
- * @remark These have identical values to the CT_* to speed up setlocale().
- * @{
- */
-#define __UPPER     0x0001      /** Upper case alphabetic character. */
-#define __LOWER     0x0002      /** Lower case alphabetic character. */
-#define __DIGIT     0x0004      /** Digits 0-9. */
-#define __SPACE     0x0008      /** White space and line ends. */
-#define __PUNCT     0x0010      /** Punctuation marks. */
-#define __CNTRL     0x0020      /** Control and format characters. */
-#define __BLANK     0x0040      /** Space and tab. */
-#define __XDIGIT    0x0080      /** Hex digits. */
-#define __ALPHA     0x0100      /** Letters and linguistic marks. */
-#define __ALNUM     0x0200      /** Alphanumeric. */
-#define __GRAPH     0x0400      /** All except controls and space. */
-#define __PRINT     0x0800      /** Everything except controls. */
-#define __NUMBER    0x1000      /** Integral number. */
-#define __SYMBOL    0x2000      /** Symbol. */
-#define __ASCII     0x8000      /** In standard ASCII set. */
-/** @} */
+#include <_ctype.h>
 
 
@@ -146 +97 @@
 #endif
 
-
-#if !defined(_DONT_USE_CTYPE_INLINE_) && \
-    (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus))
-
-__BEGIN_DECLS
-static inline int __istype(int _c, unsigned _f)
-{ return (__libc_GLocaleCtype.ausfType[_c & 0xff] & (_f)) != 0; }
-static inline int __isctype(int _c, unsigned _f)
-{ return (__libc_GLocaleCtypeDefault.ausfType[_c & 0xff] & (_f)) != 0; }
-static inline int __toupper(int _c)
-{ return __libc_GLocaleCtype.auchUpper[_c & 0xff]; }
-static inline int __tolower(int _c)
-{ return __libc_GLocaleCtype.auchLower[_c & 0xff]; }
-__END_DECLS
-
-#else
-
-__BEGIN_DECLS
-int __istype(int, unsigned);
-int __isctype(int, unsigned);
-int __toupper(int);
-int __tolower(int);
-__END_DECLS
-
 #endif
-
-#endif

trunk/src/emx/include/dlfcn.h

@@ -24 +24 @@
 #define _DLFCN_H_
 
+#include <sys/cdefs.h>
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
+
 /** @name dlopen flags
  * @{ */
@@ -44 +43 @@
 /** @} */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 void *          dlopen(const char * pszLibrary, int flFlags);
@@ -53 +50 @@
 int             dlclose(void *pvHandle);
 
-#ifdef __cplusplus
-}
+#if __BSD_VISIBLE
+struct __dlfunc_arg
+{
+    int         __dlfunc_dummy;
+};
+typedef void (*dlfunc_t)(struct __dlfunc_arg);
+dlfunc_t        dlfunc(void * __restrict, const char * __restrict);
 #endif
+
+__END_DECLS
 
 #endif

trunk/src/emx/include/regex.h

@@ -1 +1 @@
 /* regex.h,v 1.2 2004/09/14 22:27:35 bird Exp */
 /** @file
- * FreeBSD 5.1
+ * FreeBSD 5.3
  */
 /*-
@@ -40 +40 @@
  *
  *      @(#)regex.h     8.2 (Berkeley) 1/3/94
- * $FreeBSD: src/include/regex.h,v 1.6 2002/10/03 18:12:03 mike Exp $
+ * $FreeBSD: src/include/regex.h,v 1.11 2004/07/12 06:07:26 tjr Exp $
  */
 
@@ -52 +52 @@
 typedef __off_t         regoff_t;
 
-#ifndef _SIZE_T_DECLARED
+#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
 
@@ -80 +81 @@
 
 /* regerror() flags */
+#define REG_ENOSYS      (-1)
 #define REG_NOMATCH      1
 #define REG_BADPAT       2
@@ -96 +98 @@
 #define REG_ASSERT      15
 #define REG_INVARG      16
+#define REG_ILLSEQ      17
 #define REG_ATOI        255     /* convert name to number (!) */
 #define REG_ITOA        0400    /* convert number to name (!) */

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

@@ -97 +97 @@
  * character set plus one extra value (WEOF), and must be at least 16 bits.
  */
-#if 0                                   /* bird */
 typedef int             __ct_rune_t;
-#else                                   /* bird */
-typedef unsigned short  __ct_rune_t;
-#endif                                  /* bird */
 typedef __ct_rune_t     __rune_t;
+#if 0 /* bird: wchar_t is usually 2 bytes on OS/2. (might change this later!) */
 typedef __ct_rune_t     __wchar_t;
+#else /* bird */
+typedef unsigned short  __wchar_t;
+#endif /* bird */
 typedef __ct_rune_t     __wint_t;
 

trunk/src/emx/include/unidef.h

@@ -124 +124 @@
 #define C3_VOWELMARK        0x0004      /** Vowel mark. */
 #define C3_NSVOWEL          0x0005
-#define C3_SYMBOL           0x0008      /** Symbol (see CT_SYMBOL)*/
+#define C3_SYMBOL           0x0008      /** Symbol (see CT_SYMBOL). */
 #define C3_KATAKANA         0x0010      /** Katakana character (jap). */
 #define C3_HIRAGANA         0x0020      /** Hiragana character (jap). */

trunk/src/emx/include/unistd.h

@@ -449 +449 @@
 int      lockf(int, int, off_t);
 /** @todo int    nice(int); */
-/** @todo ssize_t        pread(int, void *, size_t, off_t); */
-/** @todo ssize_t        pwrite(int, const void *, size_t, off_t); */
+ssize_t  pread(int, void *, size_t, off_t);
+ssize_t  pwrite(int, const void *, size_t, off_t);
 /** @todo int    setpgrp(pid_t _pid, pid_t _pgrp); */ /* obsoleted by setpgid() */
 int      setregid(gid_t, gid_t);
@@ -500 +500 @@
 /** @todo int    iruserok(unsigned long, int, const char *, const char *); */
 /** @todo int    iruserok_sa(const void *, int, int, const char *, const char *); */
-/** @todo int    issetugid(void); */
+int      issetugid(void);
 /** @todo char  *mkdtemp(char *); */
 int      mknod(const char *, mode_t, dev_t);