From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marat Radchenko Subject: [PATCH 08/14] MINGW: git-compat-util.h: use inttypes.h for printf macros Date: Wed, 8 Oct 2014 22:01:01 +0400 Message-ID: <1412791267-13356-9-git-send-email-marat@slonopotamus.org> References: <1412791267-13356-1-git-send-email-marat@slonopotamus.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Cc: marat@slonopotamus.org, msysGit To: git@vger.kernel.org X-From: msysgit+bncBCE7TAPITACRB5XX2WQQKGQEQZGSUUY@googlegroups.com Wed Oct 08 20:01:32 2014 Return-path: Envelope-to: gcvm-msysgit@m.gmane.org Received: from mail-wi0-f192.google.com ([209.85.212.192]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XbvYG-0003aN-2X for gcvm-msysgit@m.gmane.org; Wed, 08 Oct 2014 20:01:28 +0200 Received: by mail-wi0-f192.google.com with SMTP id r20sf679139wiv.19 for ; Wed, 08 Oct 2014 11:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :sender:list-subscribe:list-unsubscribe:content-type; bh=fBz/tY6Qy7at0Rtc3l4vJDBzmofXil6qIPPyHQpV5FE=; b=eNob25scGYop1jdvbDqbVQOeuxSTxV2JaXxrNkDa+wmhEYCO8v2mZvqPWWZP9hiI9T aifFpqyWzXhJWjJzEY4KIhzMDsnGurJXtlxJJO/7K819W0LCd+yJMY3JKaRJv+VYJlHw vfyn5+rCkMICU+aCW/Q3XA6y8fuJIqKfFxOQ/buuq1w9tteAMz1g/1VdQoSmEDpBH5BS xxzFg/l/4kCy055RHMNXo1TiB8q9wYnJgucHATFpjHRdaK4x8OtQRM0WXpgtxn1+nxFp FAIg8oiXnQseMTbCfgnFWsD17mg6G9LV2qHBwmJ/24V6M7l6cA21dZmdDRq4xd+OAzOg Dw8A== X-Received: by 10.152.21.170 with SMTP id w10mr23092lae.24.1412791287818; Wed, 08 Oct 2014 11:01:27 -0700 (PDT) X-BeenThere: msysgit@googlegroups.com Received: by 10.152.8.199 with SMTP id t7ls92764laa.3.gmail; Wed, 08 Oct 2014 11:01:26 -0700 (PDT) X-Received: by 10.152.43.66 with SMTP id u2mr1831058lal.1.1412791286121; Wed, 08 Oct 2014 11:01:26 -0700 (PDT) Received: from slonopotamus.org ([94.242.204.247]) by gmr-mx.google.com with ESMTPS id ed3si931438wib.1.2014.10.08.11.01.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Oct 2014 11:01:26 -0700 (PDT) Received-SPF: none (google.com: marat@slonopotamus.org does not designate permitted sender hosts) client-ip=94.242.204.247; Received: from [176.57.72.72] (helo=noblesse.home.ru) by slonopotamus.org with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1XbvYA-0003Rz-Pj; Wed, 08 Oct 2014 22:01:23 +0400 X-Mailer: git-send-email 2.1.1 In-Reply-To: <1412791267-13356-1-git-send-email-marat@slonopotamus.org> X-Original-Sender: marat@slonopotamus.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: marat@slonopotamus.org does not designate permitted sender hosts) smtp.mail=marat@slonopotamus.org Precedence: list Mailing-list: list msysgit@googlegroups.com; contact msysgit+owners@googlegroups.com List-ID: X-Google-Group-Id: 152234828034 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , All MinGW flavors have inttypes.h, so just include it. However, we need to pass -D__USE_MINGW_ANSI_STDIO=1 to select GNU-compatible macro definitions on MinGW-W64: http://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/ As a side-effect, Git no longer builds with MSVC < 2010 due to its lack of stdint.h but hopefully that is not a problem. Signed-off-by: Marat Radchenko --- compat/mingw.h | 2 -- compat/msvc.h | 3 +++ config.mak.uname | 3 ++- git-compat-util.h | 11 ++++++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h index ba05044..59a50fc 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -358,8 +358,6 @@ static inline char *mingw_find_last_dir_sep(const char *path) int mingw_offset_1st_component(const char *path); #define offset_1st_component mingw_offset_1st_component #define PATH_SEP ';' -#define PRIuMAX "I64u" -#define PRId64 "I64d" void mingw_open_html(const char *path); #define open_html mingw_open_html diff --git a/compat/msvc.h b/compat/msvc.h index a63d878..84a03f9 100644 --- a/compat/msvc.h +++ b/compat/msvc.h @@ -17,6 +17,9 @@ typedef int pid_t; +#define PRIuMAX "I64u" +#define PRId64 "I64d" + static __inline int strcasecmp (const char *s1, const char *s2) { int size1 = strlen(s1); diff --git a/config.mak.uname b/config.mak.uname index 4470a928..c7aaa1c 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -328,6 +328,7 @@ ifeq ($(uname_S),Windows) NO_PREAD = YesPlease NEEDS_CRYPTO_WITH_SSL = YesPlease NO_LIBGEN_H = YesPlease + NO_INTTYPES_H = UnfortunatelyYes NO_POLL = YesPlease NO_SYMLINK_HEAD = YesPlease NO_IPV6 = YesPlease @@ -510,7 +511,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_POSIX_GOODIES = UnfortunatelyYes DEFAULT_HELP_FORMAT = html NO_D_INO_IN_DIRENT = YesPlease - COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32 + COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D__USE_MINGW_ANSI_STDIO=1 -DNOGDI -Icompat -Icompat/win32 ifneq (,$(findstring i686,$(CC_MACH))) COMPAT_CFLAGS += -D_USE_32BIT_TIME_T BASIC_LDFLAGS += -Wl,--large-address-aware diff --git a/git-compat-util.h b/git-compat-util.h index fb41118..b338277 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -96,6 +96,12 @@ #define GIT_WINDOWS_NATIVE #endif +#ifndef NO_INTTYPES_H +#include +#else +#include +#endif + #include #include #include @@ -147,11 +153,6 @@ #include #include #include -#ifndef NO_INTTYPES_H -#include -#else -#include -#endif #ifdef NO_INTPTR_T /* * On I16LP32, ILP32 and LP64 "long" is the save bet, however -- 2.1.1 -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.