From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2015 20:45:41 +0000 (-0800)
Subject: Merge branch 'rj/no-xopen-source-for-cygwin'
X-Git-Tag: v2.4.0-rc0~71
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ca704731b1fdf77b8f6d296bcde206c67ed9d73a?hp=fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c

Merge branch 'rj/no-xopen-source-for-cygwin'

Code cleanups.

* rj/no-xopen-source-for-cygwin:
git-compat-util.h: remove redundant code
---

diff --git a/git-compat-util.h b/git-compat-util.h
index 3455c5ece6..fd58b1d2bc 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -164,16 +164,10 @@
 typedef long intptr_t;
 typedef unsigned long uintptr_t;
 #endif
-#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
-#endif
 
 /* used on Mac OS X */
 #ifdef PRECOMPOSE_UNICODE