Changeset 566 for trunk/src/emx/include


Ignore:
Timestamp:
Aug 10, 2003, 5:24:21 PM (22 years ago)
Author:
zap
Message:

Fixed conflicts.

Location:
trunk/src/emx/include
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/emx/include/ctype.h

    • Property cvs2svn:cvs-rev changed from 1.8 to 1.9
    r565 r566  
    1 /*
    2     Locale support implementation through OS/2 Unicode API.
    3     Copyright (c) 2003 InnoTek Systemberatung GmbH
    4 
    5     For conditions of distribution and use, see the file COPYING.
    6 
    7     Character type querying.
    8 */
     1/* ctype.h (emx+gcc) */
    92
    103#ifndef _CTYPE_H
    … …  
    158#endif
    169
    17 #include <sys/locale.h>
     10extern unsigned char _ctype[];
    1811
    19 static inline int isalnum (int _c)
    20 { return __locale_ctype.cflags [_c & 0xff] & (__UPPER|__LOWER|__DIGIT); }
     12#define _UPPER  0x01
     13#define _LOWER  0x02
     14#define _DIGIT  0x04
     15#define _XDIGIT 0x08
     16#define _CNTRL  0x10
     17#define _SPACE  0x20
     18#define _PUNCT  0x40
     19#define _PRINT  0x80
    2120
    22 static inline int isalpha (int _c)
    23 { return __locale_ctype.cflags [_c & 0xff] & (__UPPER|__LOWER); }
     21extern inline int isalnum (int _c)
     22  { return (_ctype+1)[_c] & (_UPPER|_LOWER|_DIGIT); }
     23extern inline int isalpha (int _c)
     24  { return (_ctype+1)[_c] & (_UPPER|_LOWER); }
     25extern inline int iscntrl (int _c)
     26  { return (_ctype+1)[_c] & (_CNTRL); }
     27extern inline int isdigit (int _c)
     28  { return (_ctype+1)[_c] & (_DIGIT); }
     29extern inline int isgraph (int _c)
     30  { return (_ctype+1)[_c] & (_PUNCT|_UPPER|_LOWER|_DIGIT); }
     31extern inline int islower (int _c)
     32  { return (_ctype+1)[_c] & (_LOWER); }
     33extern inline int isprint (int _c)
     34  { return (_ctype+1)[_c] & (_PRINT); }
     35extern inline int ispunct (int _c)
     36  { return (_ctype+1)[_c] & (_PUNCT); }
     37extern inline int isspace (int _c)
     38  { return (_ctype+1)[_c] & (_SPACE); }
     39extern inline int isupper (int _c)
     40  { return (_ctype+1)[_c] & (_UPPER); }
     41extern inline int isxdigit (int _c)
     42  { return (_ctype+1)[_c] & (_XDIGIT); }
    2443
    25 static inline int iscntrl (int _c)
    26 { return __locale_ctype.cflags [_c & 0xff] & (__CNTRL); }
    27 
    28 static inline int isdigit (int _c)
    29 { return __locale_ctype.cflags [_c & 0xff] & (__DIGIT); }
    30 
    31 static inline int isgraph (int _c)
    32 { return __locale_ctype.cflags [_c & 0xff] & (__PUNCT|__UPPER|__LOWER|__DIGIT); }
    33 
    34 static inline int islower (int _c)
    35 { return __locale_ctype.cflags [_c & 0xff] & (__LOWER); }
    36 
    37 static inline int isprint (int _c)
    38 { return __locale_ctype.cflags [_c & 0xff] & (__PRINT); }
    39 
    40 static inline int ispunct (int _c)
    41 { return __locale_ctype.cflags [_c & 0xff] & (__PUNCT); }
    42 
    43 static inline int isspace (int _c)
    44 { return __locale_ctype.cflags [_c & 0xff] & (__SPACE); }
    45 
    46 static inline int isupper (int _c)
    47 { return __locale_ctype.cflags [_c & 0xff] & (__UPPER); }
    48 
    49 static inline int isxdigit (int _c)
    50 { return __locale_ctype.cflags [_c & 0xff] & (__XDIGIT); }
    51 
    52 static inline int toupper (int _c)
    53 { return __locale_ctype.upcase [_c & 0xff]; }
    54 
    55 static inline int tolower (int _c)
    56 { return __locale_ctype.locase [_c & 0xff]; }
    57 
    58 #if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE)
    59 
    60 #define isascii(c) (!((c) & 0x80))
    61 #define toascii(c) ((c) & 0x7f)
    62 
     44#if !defined (_CTYPE_FUN)
     45extern __inline__ int _toupper (int _c) { return (_c-'a'+'A'); }
     46extern __inline__ int _tolower (int _c) { return (_c-'A'+'a'); }
     47extern __inline__ int toupper(int _c)
     48  {return (islower(_c) ? _toupper(_c) : _c);}
     49extern __inline__ int tolower(int _c)
     50  {return (isupper(_c) ? _tolower(_c) : _c);}
    6351#endif
    6452

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

    • Property cvs2svn:cvs-rev changed from 1.3 to 1.4
    r565 r566  
    399399#define __TCPPROTO(args) __P(args)
    400400
     401/* For backward compatibility with GCC/EMX */
     402#ifndef _System
     403#define _System
     404#endif
     405
    401406#endif /* !_SYS_CDEFS_H_ */

  • trunk/src/emx/include/unidef.h

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r565 r566  
    3838#endif
    3939#ifndef APIENTRY
    40 #define APIENTRY _System
     40# ifdef _System
     41#  define APIENTRY _System
     42# else
     43#  define APIENTRY
     44# endif
    4145#endif
    4246
Note: See TracChangeset for help on using the changeset viewer.