summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-25 00:31:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-25 00:31:25 (GMT)
commitab002e34e26c39a716dc80359450f739ba907122 (patch)
tree8728bf9611ec83ea36325960c43c707aa43820b3 /git-compat-util.h
parent25f3cd527dec9909322a0f76458a0b602de61141 (diff)
parent1f759eeede0597580be8ce26305550350e3c017a (diff)
downloadgit-ab002e34e26c39a716dc80359450f739ba907122.zip
git-ab002e34e26c39a716dc80359450f739ba907122.tar.gz
git-ab002e34e26c39a716dc80359450f739ba907122.tar.bz2
Merge branch 'js/mingw-fallouts'
* js/mingw-fallouts: fetch-pack: Prepare for a side-band demultiplexer in a thread. rehabilitate some t5302 tests on 32-bit off_t machines Allow ETC_GITCONFIG to be a relative path. Introduce git_etc_gitconfig() that encapsulates access of ETC_GITCONFIG. Allow a relative builtin template directory. Close files opened by lock_file() before unlinking. builtin run_command: do not exit with -1. Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h. Use is_absolute_path() in sha1_file.c. Skip t3902-quoted.sh if the file system does not support funny names. t5302-pack-index: Skip tests of 64-bit offsets if necessary. t7501-commit.sh: Not all seds understand option -i t5300-pack-object.sh: Split the big verify-pack test into smaller parts.
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 86c8962..79eb10e 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -67,6 +67,8 @@
#include <fnmatch.h>
#include <sys/poll.h>
#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
#include <assert.h>
#include <regex.h>
#include <netinet/in.h>