From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacob Keller Subject: [PATCH 4/9] autoconf: Check for timer_t Date: Fri, 29 Aug 2014 09:42:36 -0700 Message-ID: <1409330561-11806-4-git-send-email-jacob.e.keller@intel.com> References: <1409330561-11806-1-git-send-email-jacob.e.keller@intel.com> Cc: Jonas 'Sortie' Termansen , Jacob Keller To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Aug 29 18:43:45 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XNPH6-0007qr-6D for gcvg-git-2@plane.gmane.org; Fri, 29 Aug 2014 18:43:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754122AbaH2Qnf (ORCPT ); Fri, 29 Aug 2014 12:43:35 -0400 Received: from mga14.intel.com ([192.55.52.115]:57264 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753781AbaH2QnW (ORCPT ); Fri, 29 Aug 2014 12:43:22 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 29 Aug 2014 09:34:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="378757889" Received: from jekeller-desk1.jf.intel.com (HELO jekeller-desk1.amr.corp.intel.com) ([134.134.173.156]) by FMSMGA003.fm.intel.com with ESMTP; 29 Aug 2014 09:38:37 -0700 X-Mailer: git-send-email 2.0.1.475.g9b8d714 In-Reply-To: <1409330561-11806-1-git-send-email-jacob.e.keller@intel.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Jonas 'Sortie' Termansen This type will be used in a following commit. This type was not previously used by git. This can cause trouble for people on systems without timer_t if they only rely on config.mak.uname. They will need to set NO_TIMER_T manually. Signed-off-by: Jonas 'Sortie' Termansen Signed-off-by: Jacob Keller --- Makefile | 5 +++++ config.mak.uname | 2 ++ configure.ac | 8 ++++++++ git-compat-util.h | 4 ++++ 4 files changed, 19 insertions(+) diff --git a/Makefile b/Makefile index 9f984a9e5561..54266fd77eab 100644 --- a/Makefile +++ b/Makefile @@ -182,6 +182,8 @@ all:: # # Define NO_SETITIMER if you don't have setitimer() # +# Define NO_TIMER_T if you don't have timer_t. +# # Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval # This also implies NO_SETITIMER # @@ -1338,6 +1340,9 @@ endif ifdef OBJECT_CREATION_USES_RENAMES COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1 endif +ifdef NO_TIMER_T + COMPAT_CFLAGS += -DNO_TIMER_T +endif ifdef NO_STRUCT_ITIMERVAL COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL NO_SETITIMER = YesPlease diff --git a/config.mak.uname b/config.mak.uname index 15ee15e98c2c..a5297a242561 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -355,6 +355,7 @@ ifeq ($(uname_S),Windows) NATIVE_CRLF = YesPlease DEFAULT_HELP_FORMAT = html NO_D_INO_IN_DIRENT = YesPlease + NO_TIMER_T = UnfortunatelyYes CC = compat/vcbuild/scripts/clink.pl AR = compat/vcbuild/scripts/lib.pl @@ -504,6 +505,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_POSIX_GOODIES = UnfortunatelyYes DEFAULT_HELP_FORMAT = html NO_D_INO_IN_DIRENT = YesPlease + NO_TIMER_T = UnfortunatelyYes COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32 COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_OBJS += compat/mingw.o compat/winansi.o \ diff --git a/configure.ac b/configure.ac index 6af964797f7b..126af58365fb 100644 --- a/configure.ac +++ b/configure.ac @@ -754,6 +754,14 @@ AC_CHECK_TYPES([struct itimerval], [#include ]) GIT_CONF_SUBST([NO_STRUCT_ITIMERVAL]) # +# Define NO_TIMER_T if you don't have timer_t. +AC_CHECK_TYPES([timer_t], +[NO_TIMER_T=], +[NO_TIMER_T=UnfortunatelyYes], +[#include + #include ]) +GIT_CONF_SUBST([NO_TIMER_T]) +# # Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent. AC_CHECK_MEMBER(struct dirent.d_ino, [NO_D_INO_IN_DIRENT=], diff --git a/git-compat-util.h b/git-compat-util.h index f7fae2060771..e0e7a62b642a 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -187,6 +187,10 @@ typedef unsigned long uintptr_t; extern int compat_mkdir_wo_trailing_slash(const char*, mode_t); #endif +#ifdef NO_TIMER_T +typedef int timer_t; +#endif + #ifdef NO_STRUCT_ITIMERVAL struct itimerval { struct timeval it_interval; -- 2.0.1.475.g9b8d714