diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-14 02:18:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-14 02:18:41 (GMT) |
| commit | 1db999ce8d369dbf20532f1b2ea8cbbcf6f2cc7b (patch) | |
| tree | 2594969e363819ef50ad96ad999f352f35ea2a91 /Makefile | |
| parent | c73472a8deb9dc194d05747dda3061c6324750e4 (diff) | |
| parent | 18a4f6be6b4cfc34de6f80c36ab3ef951a0f7164 (diff) | |
| download | git-1db999ce8d369dbf20532f1b2ea8cbbcf6f2cc7b.zip git-1db999ce8d369dbf20532f1b2ea8cbbcf6f2cc7b.tar.gz git-1db999ce8d369dbf20532f1b2ea8cbbcf6f2cc7b.tar.bz2 | |
Merge branch 'nd/fileno-may-be-macro'
* nd/fileno-may-be-macro:
git-compat-util: work around fileno(fp) that is a macro
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -433,6 +433,8 @@ all:: # # Define HAVE_GETDELIM if your system has the getdelim() function. # +# Define FILENO_IS_A_MACRO if fileno() is a macro, not a real function. +# # Define PAGER_ENV to a SP separated VAR=VAL pairs to define # default environment variables to be passed when a pager is spawned, e.g. # @@ -1800,6 +1802,11 @@ ifdef HAVE_WPGMPTR BASIC_CFLAGS += -DHAVE_WPGMPTR endif +ifdef FILENO_IS_A_MACRO + COMPAT_CFLAGS += -DFILENO_IS_A_MACRO + COMPAT_OBJS += compat/fileno.o +endif + ifeq ($(TCLTK_PATH),) NO_TCLTK = NoThanks endif |