diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-05 22:03:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-05 22:03:47 -0800 |
| commit | fe61935007b6803ce116e233316e4ff51de02be6 (patch) | |
| tree | 0a9120a6a8a6d80851f5ca348d31b6022c70c2de /compat | |
| parent | a1f611d5d03d7849f4d7f47f5bd39b5c44808bb5 (diff) | |
| parent | d8e21ba8967f43b61fc2fd50dd749ff8f0c6592a (diff) | |
| download | git-fe61935007b6803ce116e233316e4ff51de02be6.tar.gz | |
Merge branch 'maint'
* maint:
Remove a couple of duplicated include
grep with unmerged index
git-daemon: fix remote port number in log entry
git-svn: t9114: verify merge commit message in test
git-svn: fix dcommit clobbering when committing a series of diffs
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/inet_ntop.c | 1 | ||||
| -rw-r--r-- | compat/inet_pton.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/compat/inet_ntop.c b/compat/inet_ntop.c index 4d7ab9d975..f44498258d 100644 --- a/compat/inet_ntop.c +++ b/compat/inet_ntop.c @@ -18,7 +18,6 @@ #include <errno.h> #include <sys/types.h> #include <sys/socket.h> -#include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdio.h> diff --git a/compat/inet_pton.c b/compat/inet_pton.c index 5704e0d2b6..4078fc0877 100644 --- a/compat/inet_pton.c +++ b/compat/inet_pton.c @@ -18,7 +18,6 @@ #include <errno.h> #include <sys/types.h> #include <sys/socket.h> -#include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdio.h> |