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:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

  • trunk/src/kmk/kmkbuiltin/append.c

    r3134 r3140  
    2828*******************************************************************************/
    2929#ifndef kmk_builtin_append
    30 # include "make.h"
     30# include "makeint.h"
    3131# include "filedef.h"
    3232# include "variable.h"

  • trunk/src/kmk/kmkbuiltin/expr.c

    r2591 r3140  
    3333static int               is_zero_or_null(struct val *);
    3434static void              nexttoken(int);
    35 static void              error(void);
    3635static struct val       *eval6(void);
    3736static struct val       *eval5(void);
    … …  
    284283__attribute__((noreturn))
    285284#endif
     285#ifdef _MSC_VER
     286__declspec(noreturn)
     287#endif
    286288static void
    287289error(void)

  • trunk/src/kmk/kmkbuiltin/kSubmit.c

    r3051 r3140  
    3030# define _POSIX_C_SOURCE 1 /* 10.4 sdk and unsetenv */
    3131#endif
    32 #include "make.h"
     32#include "makeint.h"
    3333#include "job.h"
    3434#include "variable.h"

  • trunk/src/kmk/kmkbuiltin/mscfakes.c

    r3117 r3140  
    4444#undef utimes
    4545#undef lutimes
    46 
    47 #define timeval windows_timeval
    48 #include <Windows.h>
    49 #undef timeval
    5046
    5147extern ssize_t maybe_con_write(int, void const *, size_t);
    … …  
    662658
    663659
    664 int utimes(const char *pszPath, const struct timeval *paTimes)
     660int utimes(const char *pszPath, const struct msc_timeval *paTimes)
    665661{
    666662    if (paTimes)
    … …  
    677673
    678674
    679 int lutimes(const char *pszPath, const struct timeval *paTimes)
     675int lutimes(const char *pszPath, const struct msc_timeval *paTimes)
    680676{
    681677    if (paTimes)
    … …  
    692688
    693689
    694 int gettimeofday(struct timeval *pNow, void *pvIgnored)
     690int gettimeofday(struct msc_timeval *pNow, void *pvIgnored)
    695691{
    696692    struct __timeb64 Now;

  • trunk/src/kmk/kmkbuiltin/mscfakes.h

    r3092 r3140  
    110110#endif
    111111
    112 struct timeval
     112struct msc_timeval
    113113{
    114114    __time64_t tv_sec;
    115115    long tv_usec;
    116116};
     117#define timeval msc_timeval
    117118
    118119struct iovec
    … …  
    160161#endif
    161162int symlink(const char *pszDst, const char *pszLink);
    162 int utimes(const char *pszPath, const struct timeval *paTimes);
    163 int lutimes(const char *pszPath, const struct timeval *paTimes);
     163int utimes(const char *pszPath, const struct msc_timeval *paTimes);
     164int lutimes(const char *pszPath, const struct msc_timeval *paTimes);
    164165ssize_t writev(int fd, const struct iovec *vector, int count);
    165166
    166 int gettimeofday(struct timeval *pNow, void *pvIgnored);
     167int gettimeofday(struct msc_timeval *pNow, void *pvIgnored);
    167168struct tm *localtime_r(const __time64_t *pNow, struct tm *pResult);
    168169__time64_t timegm(struct tm *pNow);

  • trunk/src/kmk/kmkbuiltin/printf.c

    r2900 r3140  
    4747
    4848#if !defined(kmk_builtin_printf) && !defined(BUILTIN) && !defined(SHELL)
    49 # include "../make.h"
     49# include "../makeint.h"
    5050# include "../filedef.h"
    5151# include "../variable.h"
    … …  
    217217        g_o = NULL;
    218218
    219         (void)funcname;
    220219        if (rc != 0)
    221                 fatal (NILF, _("$(%s): failure rc=%d\n"), funcname, rc);
     220                fatal(NILF, strlen(funcname) + INTSTR_LENGTH, _("$(%s): failure rc=%d\n"), funcname, rc);
    222221        return o;
    223222}

  • trunk/src/kmk/kmkbuiltin/redirect.c

    r3110 r3140  
    3030/*# define _POSIX_C_SOURCE 1  / *  10.4 sdk and unsetenv  * / - breaks O_CLOEXEC on 10.8 */
    3131#endif
    32 #include "make.h"
     32#include "makeint.h"
    3333#include <assert.h>
    3434#include <stdio.h>

  • trunk/src/kmk/kmkbuiltin/touch.c

    r3074 r3140  
    2727*   Header Files                                                               *
    2828*******************************************************************************/
    29 #include "make.h"
     29#include "makeint.h"
    3030#include <assert.h>
    3131#include <stdarg.h>
Note: See TracChangeset for help on using the changeset viewer.