Ignore:
Timestamp:
Mar 14, 2018, 10:28:10 PM (7 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:
trunk/src/kmk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

  • trunk/src/kmk/config.h.win

    r2843 r3140  
    11/* config.h.W32 -- hand-massaged config.h file for Windows builds       -*-C-*-
    22
    3 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
    4 2006 Free Software Foundation, Inc.
     3Copyright (C) 1996-2016 Free Software Foundation, Inc.
    54This file is part of GNU Make.
    65
    76GNU Make is free software; you can redistribute it and/or modify it under the
    87terms of the GNU General Public License as published by the Free Software
    9 Foundation; either version 2, or (at your option) any later version.
     8Foundation; either version 3 of the License, or (at your option) any later
     9version.
    1010
    1111GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
    … …  
    1414
    1515You should have received a copy of the GNU General Public License along with
    16 GNU Make; see the file COPYING.  If not, write to the Free Software
    17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
     16this program.  If not, see <http://www.gnu.org/licenses/>.  */
    1817
    1918#ifndef ___config_h_win
    … …  
    2827# pragma warning(disable:4131) /* uses old-style declarator */
    2928# pragma warning(disable:4702) /* unreachable code */
    30 #endif
    31 
    32 /* Define to 1 if the `closedir' function returns void instead of `int'. */
     29# ifndef _CRT_SECURE_NO_WARNINGS
     30#  define _CRT_SECURE_NO_WARNINGS  /* function or variable may be unsafe */
     31# endif
     32# ifndef _CRT_NONSTDC_NO_WARNINGS
     33#  define _CRT_NONSTDC_NO_WARNINGS /* functions w/o a leading underscore */
     34# endif
     35#endif
     36
     37/* Define to 1 if the 'closedir' function returns void instead of 'int'. */
    3338/* #undef CLOSEDIR_VOID */
    3439
    35 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    36    systems. This function is required for `alloca.c' support on those systems.
     40/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
     41   systems. This function is required for 'alloca.c' support on those systems.
    3742   */
    3843/* #undef CRAY_STACKSEG_END */
    3944
    40 /* Define to 1 if using `alloca.c'. */
     45/* Define to 1 if using 'alloca.c'. */
    4146/* #undef C_ALLOCA */
    4247
    43 /* Define to 1 if using `getloadavg.c'. */
    44 /*#define C_GETLOADAVG 1*/
     48/* Define to 1 if using 'getloadavg.c'. */
     49#define C_GETLOADAVG 1
    4550
    4651/* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
    … …  
    5459#define FILE_TIMESTAMP_HI_RES 0
    5560
    56 /* Define to 1 if the `getloadavg' function needs to be run setuid or setgid.
     61/* Define to 1 if the 'getloadavg' function needs to be run setuid or setgid.
    5762   */
    5863/* #undef GETLOADAVG_PRIVILEGED */
    5964
    60 /* Define to 1 if you have `alloca', as a function or macro. */
     65/* Define to 1 if you have 'alloca', as a function or macro. */
    6166#define HAVE_ALLOCA 1
    6267
    … …  
    6469   */
    6570/* #undef HAVE_ALLOCA_H */
     71
     72/* Define to 1 if you have the 'atexit' function. */
     73#define HAVE_ATEXIT 1
    6674
    6775/* Define if your compiler conforms to the ANSI C standard. */
    6876#define HAVE_ANSI_COMPILER 1
    6977
    70 /* Define to 1 if you have the `bsd_signal' function. */
    71 /* #undef HAVE_BSD_SIGNAL */
    72 
    7378/* Use case insensitive file names */
    7479/* #undef HAVE_CASE_INSENSITIVE_FS */
    7580
    76 /* Define if you have the clock_gettime function. */
     81/* Define to 1 if you have the clock_gettime function. */
    7782/* #undef HAVE_CLOCK_GETTIME */
    7883
     84/* Embed GNU Guile support.  Windows build sets this on the
     85   compilation command line.  */
     86/* #undef HAVE_GUILE */
     87
    7988/* Define if the GNU dcgettext() function is already present or preinstalled.
    8089   */
    8190/* #undef HAVE_DCGETTEXT */
    8291
    83 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
     92/* Define to 1 if you have the declaration of 'bsd_signal', and to 0 if you
     93   don't. */
     94#define HAVE_DECL_BSD_SIGNAL 0
     95
     96/* Define to 1 if you have the declaration of 'sys_siglist', and to 0 if you
     97   don't. */
     98#define HAVE_DECL_SYS_SIGLIST 0
     99
     100/* Define to 1 if you have the declaration of '_sys_siglist', and to 0 if you
     101   don't. */
     102#define HAVE_DECL__SYS_SIGLIST 0
     103
     104/* Define to 1 if you have the declaration of '__sys_siglist', and to 0 if you
     105   don't. */
     106#define HAVE_DECL___SYS_SIGLIST 0
     107
     108/* Define to 1 if you have the <dirent.h> header file, and it defines 'DIR'.
    84109   */
    85110#define HAVE_DIRENT_H 1
    … …  
    92117#endif
    93118
    94 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
    95 /* #undef HAVE_DOPRNT */
    96 
    97119/* Use platform specific coding */
    98120#define HAVE_DOS_PATHS 1
    99121
    100 /* Define to 1 if you have the `dup2' function. */
     122/* Define to 1 if you have the 'dup2' function. */
    101123#define HAVE_DUP2 1
    102124
    … …  
    104126#define HAVE_FCNTL_H 1
    105127
    106 /* Define to 1 if you have the `fdopen' function. */
    107 /*#define HAVE_FDOPEN 1*/
    108 
    109 /* Define to 1 if you have the `fork' function. */
    110 /* #undef HAVE_FORK */
    111 
    112 /* Define to 1 if you have the `getcwd' function.  */
     128/* Define to 1 if you have the 'fdopen' function. */
     129#ifdef __MINGW32__
     130#define HAVE_FDOPEN 1
     131#endif
     132
     133/* Define to 1 if you have the 'fileno' function. */
     134#define HAVE_FILENO 1
     135
     136/* Define to 1 if you have the 'getcwd' function.  */
    113137#define HAVE_GETCWD 1
    114138
    115 /* Define to 1 if you have the `getgroups' function. */
     139/* Define to 1 if you have the 'getgroups' function. */
    116140/* #undef HAVE_GETGROUPS */
    117141
    118 /* Define to 1 if you have the `gethostbyname' function. */
     142/* Define to 1 if you have the 'gethostbyname' function. */
    119143/* #undef HAVE_GETHOSTBYNAME */
    120144
    121 /* Define to 1 if you have the `gethostname' function. */
     145/* Define to 1 if you have the 'gethostname' function. */
    122146/* #undef HAVE_GETHOSTNAME */
    123147
    124 /* Define to 1 if you have the `getloadavg' function. */
     148/* Define to 1 if you have the 'getloadavg' function. */
    125149/* #undef HAVE_GETLOADAVG */
    126150
    127 /* Define to 1 if you have the `getrlimit' function. */
     151/* Define to 1 if you have the 'getrlimit' function. */
    128152/* #undef HAVE_GETRLIMIT */
    129153
    … …  
    131155/* #undef HAVE_GETTEXT */
    132156
    133 /* Define if you have a standard gettimeofday function */
    134 /* #undef HAVE_GETTIMEOFDAY */
     157/* Define to 1 if you have a standard gettimeofday function */
     158#ifdef __MINGW32__
     159#define HAVE_GETTIMEOFDAY 1
     160#endif
    135161
    136162/* Define if you have the iconv() function. */
    … …  
    138164
    139165/* Define to 1 if you have the <inttypes.h> header file. */
    140 /*#define HAVE_INTTYPES_H 1*/
    141 
    142 /* Define to 1 if you have the `dgc' library (-ldgc). */
     166#ifdef __MINGW32__
     167#define HAVE_INTTYPES_H 1
     168#endif
     169
     170/* Define to 1 if you have the 'dgc' library (-ldgc). */
    143171/* #undef HAVE_LIBDGC */
    144172
    145 /* Define to 1 if you have the `kstat' library (-lkstat). */
     173/* Define to 1 if you have the 'kstat' library (-lkstat). */
    146174/* #undef HAVE_LIBKSTAT */
    147175
    … …  
    150178
    151179/* Define to 1 if you have the <locale.h> header file. */
    152 #define HAVE_LOCALE_H 1
     180#define HAVE_LOCALE_H 1 /* bird: differs */
     181
     182/* Define to 1 if you have the 'lstat' function. */
     183/* #undef HAVE_LSTAT */
    153184
    154185/* Define to 1 if you have the <mach/mach.h> header file. */
    155186/* #undef HAVE_MACH_MACH_H */
    156187
    157 /* Define to 1 if you have the `memmove' function. */
    158 #define HAVE_MEMMOVE 1
    159 
    160188/* Define to 1 if you have the <memory.h> header file. */
    161189#define HAVE_MEMORY_H 1
    162190
    163 /* Define to 1 if you have the `mkstemp' function. */
     191/* Define to 1 if you have the 'mkstemp' function. */
    164192/* #undef HAVE_MKSTEMP */
    165193
    166 /* Define to 1 if you have the `mktemp' function. */
     194/* Define to 1 if you have the 'mktemp' function. */
    167195#define HAVE_MKTEMP 1
    168196
    169 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
     197/* Define to 1 if you have the <ndir.h> header file, and it defines 'DIR'. */
    170198/* #undef HAVE_NDIR_H */
    171199
    … …  
    173201/* #undef HAVE_NLIST_H */
    174202
    175 /* Define to 1 if you have the `pipe' function. */
     203/* Define to 1 if you have the 'pipe' function. */
    176204/* #undef HAVE_PIPE */
    177205
    178 /* Define to 1 if you have the `pstat_getdynamic' function. */
     206/* Define to 1 if you have the 'pstat_getdynamic' function. */
    179207/* #undef HAVE_PSTAT_GETDYNAMIC */
    180208
    181 /* Define to 1 if you have the `realpath' function. */
     209/* Define to 1 if you have the 'readlink' function. */
     210/* #undef HAVE_READLINK */
     211
     212/* Define to 1 if you have the 'realpath' function. */
    182213/* #undef HAVE_REALPATH */
    183214
    184 /* Define if <signal.h> defines the SA_RESTART constant. */
     215/* Define to 1 if <signal.h> defines the SA_RESTART constant. */
    185216/* #undef HAVE_SA_RESTART */
    186217
    187 /* Define to 1 if you have the `setegid' function. */
     218/* Define to 1 if you have the 'setegid' function. */
    188219/* #undef HAVE_SETEGID */
    189220
    190 /* Define to 1 if you have the `seteuid' function. */
     221/* Define to 1 if you have the 'seteuid' function. */
    191222/* #undef HAVE_SETEUID */
    192223
    193 /* Define to 1 if you have the `setlinebuf' function. */
     224/* Define to 1 if you have the 'setlinebuf' function. */
    194225/* #undef HAVE_SETLINEBUF */
    195226
    196 /* Define to 1 if you have the `setlocale' function. */
     227/* Define to 1 if you have the 'setlocale' function. */
    197228/*#define HAVE_SETLOCALE 1*/
    198229
    199 /* Define to 1 if you have the `setregid' function. */
     230/* Define to 1 if you have the 'setregid' function. */
    200231/* #undef HAVE_SETREGID */
    201232
    202 /* Define to 1 if you have the `setreuid' function. */
     233/* Define to 1 if you have the 'setreuid' function. */
    203234/* #undef HAVE_SETREUID */
    204235
    205 /* Define to 1 if you have the `setrlimit' function. */
     236/* Define to 1 if you have the 'setrlimit' function. */
    206237/* #undef HAVE_SETRLIMIT */
    207238
    208 /* Define to 1 if you have the `setvbuf' function. */
    209 /*#define HAVE_SETVBUF 1 */
    210 
    211 /* Define to 1 if you have the `sigaction' function. */
     239/* Define to 1 if you have the 'setvbuf' function. */
     240#define HAVE_SETVBUF 1
     241
     242/* Define to 1 if you have the 'sigaction' function. */
    212243/* #undef HAVE_SIGACTION */
    213244
    214 /* Define to 1 if you have the `sigsetmask' function. */
     245/* Define to 1 if you have the 'sigsetmask' function. */
    215246/* #undef HAVE_SIGSETMASK */
    216247
    217 /* Define to 1 if you have the `socket' function. */
     248/* Define to 1 if you have the 'socket' function. */
    218249/* #undef HAVE_SOCKET */
    219250
    220 /* Define to 1 if you have the <stdarg.h> header file. */
    221 #define HAVE_STDARG_H 1
    222 
    223251/* Define to 1 if you have the <stdint.h> header file. */
    224 #if _MSC_VER >= 1600
     252#if defined(__MINGW32__) || _MSC_VER >= 1600 /* bird: added latter */
    225253# define HAVE_STDINT_H 1
    226254#endif
    … …  
    229257#define HAVE_STDLIB_H 1
    230258
    231 /* Define to 1 if you have the `strcasecmp' function. */
    232 /* #undef HAVE_STRCASECMP */
    233 
    234 /* Define to 1 if you have the `strcmpi' function. */
     259/* Define to 1 if you have the 'strcasecmp' function. */
     260#ifdef __MINGW32__
     261#define HAVE_STRCASECMP 1
     262#endif
     263
     264/* Define to 1 if you have the 'strcmpi' function. */
    235265#define HAVE_STRCMPI 1
    236266
    237 /* Define to 1 if you have the `stricmp' function. */
    238 /* #undef HAVE_STRICMP */
    239 
    240 /* Define to 1 if you have the `strchr' function. */
    241 #define HAVE_STRCHR 1
    242 
    243 /* Define to 1 if you have the `strcoll' function and it is properly defined.
     267/* Define to 1 if you have the 'strcoll' function and it is properly defined.
    244268   */
    245269#define HAVE_STRCOLL 1
    246270
    247 /* Define to 1 if you have the `strdup' function. */
    248 #define HAVE_STRDUP 1 /* bird */
    249 
    250 /* Define to 1 if you have the `strerror' function. */
     271/* Define to 1 if you have the 'strdup' function. */
     272#define HAVE_STRDUP 1
     273
     274/* Define to 1 if you have the 'strerror' function. */
    251275#define HAVE_STRERROR 1
     276
     277/* Define to 1 if you have the 'stricmp' function. */
     278#define HAVE_STRICMP 1
    252279
    253280/* Define to 1 if you have the <strings.h> header file. */
    … …  
    257284#define HAVE_STRING_H 1
    258285
    259 /* Define to 1 if you have the `strsignal' function. */
     286/* Define to 1 if you have the 'strncasecmp' function. */
     287#ifdef __MINGW32__
     288#define HAVE_STRNCASECMP 1
     289#endif
     290
     291/* Define to 1 if you have the 'strncmpi' function. */
     292/* #undef HAVE_STRNCMPI */
     293
     294/* Define to 1 if you have the 'strndup' function. */
     295/* #undef HAVE_STRNDUP */
     296
     297/* Define to 1 if you have the 'strnicmp' function. */
     298/*#ifdef __MINGW32__ - bird */
     299#define HAVE_STRNICMP 1
     300/* #endif - bird */
     301
     302/* Define to 1 if you have the 'strsignal' function. */
    260303/* #undef HAVE_STRSIGNAL */
    261304
    262 /* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
     305/* Define to 1 if you have the `isatty' function. */
     306#define HAVE_ISATTY 1
     307
     308/* Define to 1 if you have the `ttyname' function. */
     309#define HAVE_TTYNAME 1
     310char *ttyname (int);
     311
     312/* Define to 1 if 'n_un.n_name' is a member of 'struct nlist'. */
    263313/* #undef HAVE_STRUCT_NLIST_N_UN_N_NAME */
    264314
    265 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
     315/* Define to 1 if you have the <sys/dir.h> header file, and it defines 'DIR'.
    266316   */
    267317/* #undef HAVE_SYS_DIR_H */
    268318
    269 /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
     319/* Define to 1 if you have the <sys/ndir.h> header file, and it defines 'DIR'.
    270320   */
    271321/* #undef HAVE_SYS_NDIR_H */
    272322
    273323/* Define to 1 if you have the <sys/param.h> header file. */
    274 /* #define HAVE_SYS_PARAM_H 1 */
     324#ifdef __MINGW32__
     325#define HAVE_SYS_PARAM_H 1
     326#endif
    275327
    276328/* Define to 1 if you have the <sys/resource.h> header file. */
    … …  
    281333
    282334/* Define to 1 if you have the <sys/timeb.h> header file. */
    283 /*#define HAVE_SYS_TIMEB_H 1*/
     335#define HAVE_SYS_TIMEB_H 1
    284336
    285337/* Define to 1 if you have the <sys/time.h> header file. */
    286 /*#define HAVE_SYS_TIME_H 1*/
     338#ifdef __MINGW32__
     339#define HAVE_SYS_TIME_H 1
     340#endif
    287341
    288342/* Define to 1 if you have the <sys/types.h> header file. */
    289 /*#define HAVE_SYS_TYPES_H 1*/
     343#define HAVE_SYS_TYPES_H 1
    290344
    291345/* Define to 1 if you have the <sys/wait.h> header file. */
    292346/* #undef HAVE_SYS_WAIT_H */
    293347
    294 /* Define this if you have the \`union wait' type in <sys/wait.h>. */
     348/* Define to 1 if you have the \'union wait' type in <sys/wait.h>. */
    295349/* #undef HAVE_UNION_WAIT */
    296350
    297351/* Define to 1 if you have the <unistd.h> header file. */
    298 /* #define HAVE_UNISTD_H 1*/
    299 
    300 /* Define to 1 if you have the <varargs.h> header file. */
    301 /* #undef HAVE_VARARGS_H */
    302 
    303 /* Define to 1 if you have the `vfork' function. */
    304 /* #undef HAVE_VFORK */
    305 
    306 /* Define to 1 if you have the <vfork.h> header file. */
    307 /* #undef HAVE_VFORK_H */
    308 
    309 /* Define to 1 if you have the `vprintf' function. */
    310 #define HAVE_VPRINTF 1
    311 
    312 
    313 /* Define to 1 if you have the `wait3' function. */
     352#ifdef __MINGW32__
     353#define HAVE_UNISTD_H 1
     354#endif
     355
     356/* Define to 1 if you have the 'wait3' function. */
    314357/* #undef HAVE_WAIT3 */
    315358
    316 /* Define to 1 if you have the `waitpid' function. */
     359/* Define to 1 if you have the 'waitpid' function. */
    317360/* #undef HAVE_WAITPID */
    318 
    319 /* Define to 1 if `fork' works. */
    320 /* #undef HAVE_WORKING_FORK */
    321 
    322 /* Define to 1 if `vfork' works. */
    323 /* #undef HAVE_WORKING_VFORK */
    324361
    325362/* Build host information. (not used by kmk) */
    326363#define MAKE_HOST "Windows32"
    327364
    328 /* Define this to enable job server support in GNU make. */
    329 /* #undef MAKE_JOBSERVER */
    330 
    331 /* Define to 1 if your `struct nlist' has an `n_un' member. Obsolete, depend
    332    on `HAVE_STRUCT_NLIST_N_UN_N_NAME */
     365/* Define to 1 to enable job server support in GNU make. */
     366#define MAKE_JOBSERVER 1
     367
     368/* Define to 1 to enable 'load' support in GNU make. */
     369#define MAKE_LOAD 1
     370
     371/* Define to 1 to enable symbolic link timestamp checking. */
     372/* #undef MAKE_SYMLINKS */
     373
     374/* Define to 1 if your 'struct nlist' has an 'n_un' member. Obsolete, depend
     375   on 'HAVE_STRUCT_NLIST_N_UN_N_NAME */
    333376/* #undef NLIST_NAME_UNION */
    334377
    335 /* Define if struct nlist.n_name is a pointer rather than an array. */
     378/* Define to 1 if struct nlist.n_name is a pointer rather than an array. */
    336379/* #undef NLIST_STRUCT */
    337380
    … …  
    346389
    347390/* Define to the full name of this package. */
    348 #define PACKAGE_NAME "GNU make"
    349 
    350 /* Define to the full name and version of this package. */
    351 #define PACKAGE_STRING "GNU make 3.82"
    352 
    353 /* Define to the one symbol short name of this package. */
    354 #define PACKAGE_TARNAME "make"
     391#define PACKAGE_NAME "kmk"
     392
     393/* Define to the home page for this package. */
     394#define PACKAGE_URL "http://kbuild.org/"
    355395
    356396/* Define to the version of this package. */
    357 #define PACKAGE_VERSION "3.82"
    358 
    359 /* Define to 1 if the C compiler supports function prototypes. */
    360 #define PROTOTYPES 1
    361 
    362 /* Define as the return type of signal handlers (`int' or `void'). */
     397#define PACKAGE_VERSION "4.2.1"
     398
     399/* Define to the character that separates directories in PATH. */
     400#define PATH_SEPARATOR_CHAR ';'
     401
     402/* Define as the return type of signal handlers ('int' or 'void'). */
    363403#define RETSIGTYPE void
    364404
    … …  
    369409/* #undef SCCS_GET_MINUS_G */
    370410
    371 /* Define to 1 if the `setvbuf' function takes the buffering type as its
     411/* Define to 1 if the 'setvbuf' function takes the buffering type as its
    372412   second argument and the buffer pointer as the third, as on System V before
    373413   release 3. */
    … …  
    376416/* If using the C implementation of alloca, define if you know the
    377417   direction of stack growth for your system; otherwise it will be
    378    automatically deduced at run-time.
    379         STACK_DIRECTION > 0 => grows toward higher addresses
    380         STACK_DIRECTION < 0 => grows toward lower addresses
    381         STACK_DIRECTION = 0 => direction of growth unknown */
     418   automatically deduced at run time.
     419        STACK_DIRECTION > 0 => grows toward higher addresses
     420        STACK_DIRECTION < 0 => grows toward lower addresses
     421        STACK_DIRECTION = 0 => direction of growth unknown */
    382422/* #undef STACK_DIRECTION */
    383423
    384 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
     424/* Define to 1 if the 'S_IS*' macros in <sys/stat.h> do not work properly. */
    385425/* #undef STAT_MACROS_BROKEN */
    386426
    … …  
    389429
    390430/* Define if struct stat contains a nanoseconds field */
    391 #define ST_MTIM_NSEC tv_nsec
     431#define ST_MTIM_NSEC tv_nsec /* bird */
    392432
    393433/* Define to 1 on System V Release 4. */
    … …  
    395435
    396436/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
    397 /* #define TIME_WITH_SYS_TIME 1 */
     437#ifdef __MINGW32__
     438#define TIME_WITH_SYS_TIME 1
     439#endif
    398440
    399441/* Define to 1 for Encore UMAX. */
    … …  
    405447
    406448/* Version number of package */
    407 #define VERSION "3.82"
     449#define VERSION "4.2.1"
    408450
    409451/* Define if using the dmalloc debugging malloc package */
    … …  
    430472/* #undef _POSIX_1_SOURCE */
    431473
    432 /* Define to 1 if you need to in order for `stat' and other things to work. */
    433 #define _POSIX_SOURCE 1
    434 
    435 /* Define like PROTOTYPES; this can be used by system headers. */
    436 /*#define __PROTOTYPES 1*/
    437 
    438 /* Define to empty if `const' does not conform to ANSI C. */
     474/* Define to 1 if you need to in order for 'stat' and other things to work. */
     475/* #undef _POSIX_SOURCE */
     476
     477/* Define to empty if 'const' does not conform to ANSI C. */
    439478/* #undef const */
    440479
    441 /* Define to `int' if <sys/types.h> doesn't define. */
     480/* Define to 'int' if <sys/types.h> doesn't define. */
    442481#define gid_t int
    443482
    444 /* Define to `int' if <sys/types.h> does not define. */
     483/* Define to 'int' if <sys/types.h> does not define. */
    445484/* Note (bird)! sub_proc.c needs this to be pointer sized. */
    446485#define pid_t intptr_t
    447486
    448 /* Define to `int' if <sys/types.h> doesn't define. */
     487/* Define to 'int' if <sys/types.h> doesn't define. */
    449488#define uid_t int
    450489
    451490/* Define uintmax_t if not defined in <stdint.h> or <inttypes.h>. */
    452 #if _MSC_VER < 1600
     491#if !HAVE_STDINT_H && !HAVE_INTTYPES_H
    453492# if 0
    454493#  define uintmax_t unsigned long
    … …  
    458497#endif
    459498
    460 /* Define as `fork' if `vfork' does not work. */
    461 /*#define vfork fork*/
    462 
    463 #if 0/* see above */
    464 /* Define to `unsigned long' or `unsigned long long'
    465    if <inttypes.h> doesn't define.  */
    466 #define uintmax_t unsigned long
    467 #endif
    468 
    469 /* Define if you support file names longer than 14 characters.  */
    470 #define HAVE_LONG_FILE_NAMES 1
    471 
    472 /* Define if your struct stat has st_rdev.  */
    473 #undef HAVE_ST_RDEV
    474 #define HAVE_ST_RDEV 1
    475 
    476 /* Define if you have the strftime function.  */
    477 #undef HAVE_STRFTIME
    478 #define HAVE_STRFTIME 1
    479 
    480499/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
    481500/* #undef HAVE_SYS_WAIT_H */
    482 
    483 /* Define if your struct tm has tm_zone.  */
    484 /* #undef HAVE_TM_ZONE */
    485 
    486 /* Define if you don't have tm_zone but do have the external array
    487    tzname.  */
    488 #undef HAVE_TZNAME
    489 #define HAVE_TZNAME 1
    490 
    491 /* Define if utime(file, NULL) sets file's timestamp to the present.  */
    492 #undef HAVE_UTIME_NULL
    493 #define HAVE_UTIME_NULL 1
    494501
    495502/* Define to the installation directory for locales.  */
    … …  
    547554#include "inlined_memchr.h"
    548555
    549 #ifdef CONFIG_WITH_FAST_IS_SPACE
    550 # include <ctype.h>
    551 # if _MSC_VER >= 1400
    552 #  include <intrin.h>
    553 #  pragma intrinsic(_bittest)
    554 #  pragma intrinsic(_bittestandset)
    555 #  define space_map_size          32
    556 #  define set_space_map_entry(ch) _bittestandset((long *)&space_map[0], (unsigned char)(ch))
    557 #  define isspace(ch)             _bittest((long *)&space_map[0], (unsigned char)(ch))
    558 # else
    559 #  define space_map_size          256
    560 #  define set_space_map_entry(ch) (space_map[(unsigned char)(ch)] = 1)
    561 #  define isspace(ch)             (space_map[(unsigned char)(ch)])
    562 # endif
    563 extern char space_map[space_map_size];
    564 #endif
    565 
    566556/* bird: Include mscfakes.h to make sure we have all it's tricks applied. */
    567557#ifndef ___mscfakes_h
    … …  
    569559#endif
    570560
     561/*
     562 * Map posixfcn.c stuff to non-conflicting names.
     563 */
     564#include <stdio.h>
     565#include <io.h>
     566
     567#define tmpfile posixfcn_tmpfile
     568FILE *posixfcn_tmpfile(void);
     569
     570#define isatty posixfcn_isatty
     571int posixfcn_isatty(int fd);
     572
    571573#endif /* bird */
    572574
Note: See TracChangeset for help on using the changeset viewer.