diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-03 19:47:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-03 19:47:46 -0800 |
| commit | 253e772edeb56092e0fad43ec0640658671313c5 (patch) | |
| tree | 8e9278a4ac03353056acd765c04779e01b0ce2f9 /git-compat-util.h | |
| parent | 4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c (diff) | |
| parent | 7943b3a94f0f862dc9d7dcec6b5639ae5bf027bd (diff) | |
| download | git-253e772edeb56092e0fad43ec0640658671313c5.tar.gz git-253e772edeb56092e0fad43ec0640658671313c5.tar.xz | |
Merge branch 'maint'
* maint:
Unset NO_C99_FORMAT on Cygwin.
Fix a "pointer type missmatch" warning.
Fix some "comparison is always true/false" warnings.
Fix an "implicit function definition" warning.
Fix a "label defined but unreferenced" warning.
Document the config variable format.suffix
git-merge: fail correctly when we cannot fast forward.
builtin-archive: use RUN_SETUP
Fix git-gc usage note
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 5d154faef..56212b2f1 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -49,9 +49,15 @@ #include <netdb.h> #include <pwd.h> #include <inttypes.h> +#if defined(__CYGWIN__) +#undef _XOPEN_SOURCE +#include <grp.h> +#define _XOPEN_SOURCE 600 +#else #undef _ALL_SOURCE /* AIX 5.3L defines a struct list with _ALL_SOURCE. */ #include <grp.h> #define _ALL_SOURCE 1 +#endif #ifndef NO_ICONV #include <iconv.h> |