Changeset 3828 for trunk


Ignore:
Timestamp:
Feb 28, 2014, 1:08:17 AM (11 years ago)
Author:
bird
Message:

The watcom saga continues.

Location:
trunk/libc/src/glibc
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/libc/src/glibc/crypt/crypt-entry.c

    r2191 r3828  
    4949/* Prototypes for local functions.  */
    5050#if __STDC__ - 0
    51 #if !defined __GNU_LIBRARY__ && !defined __INNOTEK_LIBC__
     51#if !defined __GNU_LIBRARY__ && !defined(__KLIBC__)
    5252void _ufc_clearmem (char *start, int cnt);
    5353#else
    … …  
    8181  ufc_long xx = 25; /* to cope with GCC long long compiler bugs */
    8282
    83 #if defined _LIBC || defined __INNOTEK_LIBC__
     83#if defined _LIBC || defined(__KLIBC__)
    8484  /* Try to find out whether we have to use MD5 encryption replacement.  */
    8585  if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
    … …  
    124124     const char *salt;
    125125{
    126 #if defined _LIBC || defined __INNOTEK_LIBC__
     126#if defined _LIBC || defined(__KLIBC__)
    127127  /* Try to find out whether we have to use MD5 encryption replacement.  */
    128128  if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
    … …  
    138138 * They don't need to call init_des.
    139139 */
    140 #if defined _LIBC || defined __INNOTEK_LIBC__
     140#if defined _LIBC || defined(__KLIBC__)
    141141weak_alias (crypt, fcrypt)
    142142#else

  • trunk/libc/src/glibc/crypt/crypt_util.c

    r2191 r3828  
    5050/* Prototypes for local functions.  */
    5151#if __STDC__ - 0
    52 #if !defined(__GNU_LIBRARY__) && !defined(__INNOTEK_LIBC__)
     52#if !defined(__GNU_LIBRARY__) && !defined(__KLIBC__)
    5353void _ufc_clearmem (char *start, int cnt);
    5454void _ufc_copymem (char *from, char *to, int cnt);
    … …  
    268268__libc_lock_define_initialized (static, _ufc_tables_lock)
    269269#endif
    270 #ifdef __INNOTEK_LIBC__
     270#ifdef __KLIBC__
    271271#include <sys/smutex.h>
    272272#endif
    … …  
    274274
    275275
    276 #if defined(DEBUG) && !defined(__INNOTEK_LIBC__)
     276#if defined(DEBUG) && !defined(__KLIBC__)
    277277
    278278void
    … …  
    309309#endif
    310310
    311 #if !defined(__GNU_LIBRARY__) && !defined(__INNOTEK_LIBC__)
     311#if !defined(__GNU_LIBRARY__) && !defined(__KLIBC__)
    312312/*
    313313 * Silly rewrites of 'bzero'/'memset'. I do so
    … …  
    375375      goto small_tables_done;
    376376#endif
    377 #ifdef __INNOTEK_LIBC__
     377#ifdef __KLIBC__
    378378    static _smutex smtx;
    379379    _smutex_request(&smtx);
    … …  
    488488    __libc_lock_unlock(_ufc_tables_lock);
    489489#endif
    490 #ifdef __INNOTEK_LIBC__
     490#ifdef __KLIBC__
    491491small_tables_done:
    492492    _smutex_release(&smtx);

  • trunk/libc/src/glibc/crypt/md5-crypt.c

    r2191 r3828  
    264264}
    265265
    266 #if !defined _LIBC && !defined __INNOTEK_LIBC__
     266#if !defined _LIBC && !defined(__KLIBC__)
    267267static void
    268268__attribute__ ((__destructor__))

  • trunk/libc/src/glibc/crypt/md5.c

    r2191 r3828  
    2929#include <sys/types.h>
    3030
    31 #if STDC_HEADERS || defined _LIBC || defined __INNOTEK_LIBC__
     31#if STDC_HEADERS || defined _LIBC || defined(__KLIBC__)
    3232# include <stdlib.h>
    3333# include <string.h>
    … …  
    4040#include "md5.h"
    4141
    42 #if defined _LIBC || defined __INNOTEK_LIBC__
     42#if defined _LIBC || defined(__KLIBC__)
    4343# include <endian.h>
    4444# if __BYTE_ORDER == __BIG_ENDIAN

  • trunk/libc/src/glibc/crypt/md5.h

    r2191 r3828  
    2424#include <stdio.h>
    2525
    26 #if defined HAVE_LIMITS_H || (defined _LIBC && _LIBC) || defined(__INNOTEK_LIBC__)
     26#if defined HAVE_LIMITS_H || (defined _LIBC && _LIBC) || defined(__KLIBC__)
    2727# include <limits.h>
    2828#endif
    … …  
    3535   is usually not possible.  */
    3636
    37 #if defined _LIBC || defined __INNOTEK_LIBC__
     37#if defined _LIBC || defined(__KLIBC__)
    3838# include <stdint.h>
    3939typedef uint32_t md5_uint32;

  • trunk/libc/src/glibc/malloc/obstack.c

    r2155 r3828  
    9090/* Exit value used when `print_and_abort' is used.  */
    9191# include <stdlib.h>
    92 # if defined _LIBC || defined __INNOTEK_LIBC__
     92# if defined _LIBC || defined(__KLIBC__)
    9393int obstack_exit_failure = EXIT_FAILURE;
    9494# else
    … …  
    386386
    387387/* Define the error handler.  */
    388 #ifndef __INNOTEK_LIBC__
     388#ifndef __KLIBC__
    389389# ifdef _LIBC
    390390#  include <libintl.h>
    … …  
    395395#  define _(msgid) gettext (msgid)
    396396# endif
    397 #else /* __INNOTEK_LIBC__ */
     397#else /* __KLIBC__ */
    398398# undef _
    399399# define _(x)  (x)
    400 #endif /* __INNOTEK_LIBC__ */
     400#endif /* __KLIBC__ */
    401401
    402402

  • trunk/libc/src/glibc/posix/getopt.c

    r2212 r3828  
    5656/* This needs to come after some library #include
    5757   to get __GNU_LIBRARY__ defined.  */
    58 #if defined __GNU_LIBRARY__ || defined __INNOTEK_LIBC__
     58#if defined __GNU_LIBRARY__ || defined(__KLIBC__)
    5959/* Don't include stdlib.h for non-GNU C libraries because some of them
    6060   contain conflicting prototypes for getopt.  */
    … …  
    6969#endif
    7070
    71 #ifndef __INNOTEK_LIBC__
     71#ifndef __KLIBC__
    7272#ifndef _LIBC
    7373# include <libintl.h>
    … …  
    7676# define _(msgid) gettext (msgid)
    7777#endif
    78 #else /* __INNOTEK_LIBC__ */
     78#else /* __KLIBC__ */
    7979# define _(msgid) msgid
    80 #endif /* __INNOTEK_LIBC__ */
     80#endif /* __KLIBC__ */
    8181
    8282#if defined _LIBC && defined USE_IN_LIBIO

  • trunk/libc/src/glibc/posix/regcomp.c

    r3059 r3828  
    641641   them unless specifically requested.  */
    642642
    643 #if defined _REGEX_RE_COMP || defined _LIBC || defined __INNOTEK_LIBC__
     643#if defined _REGEX_RE_COMP || defined _LIBC || defined(__KLIBC__)
    644644
    645645/* BSD has one and only one pattern buffer.  */

  • trunk/libc/src/glibc/posix/regex_internal.h

    r3059 r3828  
    4646# include <stdint.h>
    4747#endif /* HAVE_STDINT_H || _LIBC */
    48 #if defined _LIBC || defined __INNOTEK_LIBC__
     48#if defined _LIBC || defined(__KLIBC__)
    4949# include <bits/libc-lock.h>
    5050#else
    … …  
    7070
    7171/* This is for other GNU distributions with internationalized messages.  */
    72 #if !defined(__INNOTEK_LIBC__) && (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
     72#if !defined(__KLIBC__) && (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
    7373# include <libintl.h>
    7474# ifdef _LIBC
    … …  
    9292#endif
    9393
    94 #ifndef __INNOTEK_LIBC__
     94#ifndef __KLIBC__
    9595#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC
    9696# define RE_ENABLE_I18N
    … …  
    383383
    384384#ifndef _LIBC
    385 # if defined __i386__ && !defined __INNOTEK_LIBC__
     385# if defined __i386__ && !defined(__KLIBC__)
    386386#  define internal_function   __attribute ((regparm (3), stdcall))
    387387# else

  • trunk/libc/src/glibc/posix/regexec.c

    r3059 r3828  
    596596   them unless specifically requested.  */
    597597
    598 #if defined _REGEX_RE_COMP || defined _LIBC || __INNOTEK_LIBC__
     598#if defined _REGEX_RE_COMP || defined _LIBC || __KLIBC__
    599599int
    600600# ifdef _LIBC

  • trunk/libc/src/glibc/sysdeps/generic/math_private.h

    r2150 r3828  
    11#include "../../../msun/src/math_private.h"
    2 #ifdef __INNOTEK_LIBC__
     2#ifdef __KLIBC__
    33# define strong_alias(name, aliasname) _strong_alias(name, aliasname)
    44# define _strong_alias(name, aliasname) \

  • trunk/libc/src/glibc/sysdeps/generic/w_lgammal.c

    r2150 r3828  
    3636#endif
    3737{
    38 #if defined _IEEE_LIBM || defined __INNOTEK_LIBC__
     38#if defined _IEEE_LIBM || defined(__KLIBC__)
    3939        return __ieee754_lgammal_r(x,&signgam);
    4040#else

  • trunk/libc/src/glibc/sysdeps/generic/w_tgammaf.c

    r2150 r3828  
    3434        y = __ieee754_gammaf_r(x,&local_signgam);
    3535        if (local_signgam < 0) y = -y;
    36 #if defined _IEEE_LIBM || defined __INNOTEK_LIBC__
     36#if defined _IEEE_LIBM || defined(__KLIBC__)
    3737        return y;
    3838#else

  • trunk/libc/src/glibc/sysdeps/generic/w_tgammal.c

    r2150 r3828  
    3939        y = __ieee754_gammal_r(x,&local_signgam);
    4040        if (local_signgam < 0) y = -y;
    41 #if defined _IEEE_LIBM || defined __INNOTEK_LIBC__
     41#if defined _IEEE_LIBM || defined(__KLIBC__)
    4242        return y;
    4343#else
Note: See TracChangeset for help on using the changeset viewer.