summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-13 23:26:31 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-13 23:26:31 -0800
commit801b28a34acc05a4d70643c1905fde71c9d3aee1 (patch)
treedb10dfbb849d770ade4e8c70ead3e8a8e673d609
parent1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb (diff)
parentcd4c4e2481dd6fcb7ceb39242fa722993f8c0ab1 (diff)
downloadgit-801b28a34acc05a4d70643c1905fde71c9d3aee1.tar.gz
Merge branch 'bw/inet-pton-ntop-compat' into maint
* bw/inet-pton-ntop-compat: Drop system includes from inet_pton/inet_ntop compatibility wrappers
-rw-r--r--compat/inet_ntop.c6
-rw-r--r--compat/inet_pton.c6
2 files changed, 0 insertions, 12 deletions
diff --git a/compat/inet_ntop.c b/compat/inet_ntop.c
index 60b5a1d0f8..90b7cc45f3 100644
--- a/compat/inet_ntop.c
+++ b/compat/inet_ntop.c
@@ -15,14 +15,8 @@
* SOFTWARE.
*/
-#include <errno.h>
-#include <sys/types.h>
-
#include "../git-compat-util.h"
-#include <stdio.h>
-#include <string.h>
-
#ifndef NS_INADDRSZ
#define NS_INADDRSZ 4
#endif
diff --git a/compat/inet_pton.c b/compat/inet_pton.c
index 2ec995e63d..2b9a0a4e22 100644
--- a/compat/inet_pton.c
+++ b/compat/inet_pton.c
@@ -15,14 +15,8 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <errno.h>
-#include <sys/types.h>
-
#include "../git-compat-util.h"
-#include <stdio.h>
-#include <string.h>
-
#ifndef NS_INT16SZ
#define NS_INT16SZ 2
#endif