mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'md/interix'

Browse Source 
* md/interix:
  Interix: add configure checks
  add support for the SUA layer (interix; windows)

Conflicts:
	git-compat-util.h
This commit is contained in:
Junio C Hamano
2010-11-29 17:52:34 -08:00
parent 1aa6583cc2 25fe66f84c
commit ec3f7d5d0f
4 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@ -1099,6 +1099,25 @@ else
endif endif
X = .exe X = .exe
endif endif
ifeq ($(uname_S),Interix)
NO_SYS_POLL_H = YesPlease
NO_INTTYPES_H = YesPlease
NO_INITGROUPS = YesPlease
NO_IPV6 = YesPlease
NO_MEMMEM = YesPlease
NO_MKDTEMP = YesPlease
NO_STRTOUMAX = YesPlease
NO_NSEC = YesPlease
NO_MKSTEMPS = YesPlease
ifeq ($(uname_R),3.5)
NO_INET_NTOP = YesPlease
NO_INET_PTON = YesPlease
endif
ifeq ($(uname_R),5.2)
NO_INET_NTOP = YesPlease
NO_INET_PTON = YesPlease
endif
endif
ifneq (,$(findstring MINGW,$(uname_S))) ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ; pathsep = ;
NO_PREAD = YesPlease NO_PREAD = YesPlease
@ -1363,6 +1382,15 @@ endif
ifdef NO_SYS_SELECT_H ifdef NO_SYS_SELECT_H
BASIC_CFLAGS += -DNO_SYS_SELECT_H BASIC_CFLAGS += -DNO_SYS_SELECT_H
endif endif
ifdef NO_SYS_POLL_H
BASIC_CFLAGS += -DNO_SYS_POLL_H
endif
ifdef NO_INTTYPES_H
BASIC_CFLAGS += -DNO_INTTYPES_H
endif
ifdef NO_INITGROUPS
BASIC_CFLAGS += -DNO_INITGROUPS
endif
ifdef NO_MMAP ifdef NO_MMAP
COMPAT_CFLAGS += -DNO_MMAP COMPAT_CFLAGS += -DNO_MMAP
COMPAT_OBJS += compat/mmap.o COMPAT_OBJS += compat/mmap.o

18
configure.ac
View File

@ -617,6 +617,18 @@ AC_CHECK_HEADER([sys/select.h],
[NO_SYS_SELECT_H=UnfortunatelyYes]) [NO_SYS_SELECT_H=UnfortunatelyYes])
AC_SUBST(NO_SYS_SELECT_H) AC_SUBST(NO_SYS_SELECT_H)
# #
# Define NO_SYS_POLL_H if you don't have sys/poll.h
AC_CHECK_HEADER([sys/poll.h],
[NO_SYS_POLL_H=],
[NO_SYS_POLL_H=UnfortunatelyYes])
AC_SUBST(NO_SYS_POLL_H)
#
# Define NO_INTTYPES_H if you don't have inttypes.h
AC_CHECK_HEADER([inttypes.h],
[NO_INTTYPES_H=],
[NO_INTTYPES_H=UnfortunatelyYes])
AC_SUBST(NO_INTTYPES_H)
#
# Define OLD_ICONV if your library has an old iconv(), where the second # Define OLD_ICONV if your library has an old iconv(), where the second
# (input buffer pointer) parameter is declared with type (const char **). # (input buffer pointer) parameter is declared with type (const char **).
AC_DEFUN([OLDICONVTEST_SRC], [[ AC_DEFUN([OLDICONVTEST_SRC], [[
@ -868,6 +880,12 @@ GIT_CHECK_FUNC(mkstemps,
[NO_MKSTEMPS=YesPlease]) [NO_MKSTEMPS=YesPlease])
AC_SUBST(NO_MKSTEMPS) AC_SUBST(NO_MKSTEMPS)
# #
# Define NO_INITGROUPS if you don't have initgroups in the C library.
GIT_CHECK_FUNC(initgroups,
[NO_INITGROUPS=],
[NO_INITGROUPS=YesPlease])
AC_SUBST(NO_INITGROUPS)
#
# #
# Define NO_MMAP if you want to avoid mmap. # Define NO_MMAP if you want to avoid mmap.
# #

4
daemon.c
View File

@ -13,6 +13,10 @@
#define NI_MAXSERV 32 #define NI_MAXSERV 32
#endif #endif
#ifdef NO_INITGROUPS
#define initgroups(x, y) (0) /* nothing */
#endif
static int log_syslog; static int log_syslog;
static int verbose; static int verbose;
static int reuseaddr; static int reuseaddr;

8
git-compat-util.h
View File

@ -105,7 +105,11 @@
#include <regex.h> #include <regex.h>
#include <utime.h> #include <utime.h>
#include <syslog.h> #include <syslog.h>
#ifndef NO_SYS_POLL_H
#include <sys/poll.h> #include <sys/poll.h>
#else
#include <poll.h>
#endif
#ifndef __MINGW32__ #ifndef __MINGW32__
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -119,7 +123,11 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#include <pwd.h> #include <pwd.h>
#ifndef NO_INTTYPES_H
#include <inttypes.h> #include <inttypes.h>
#else
#include <stdint.h>
#endif
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
#undef _XOPEN_SOURCE #undef _XOPEN_SOURCE
#include <grp.h> #include <grp.h>