summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-03 13:53:11 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-03 13:53:11 -0700
commit44bc573436c98b7c6cd798af04c538f6e76f0f6e (patch)
treec4dbc1ac7a92ef12098c0e7676ed1ee41a8f60f0 /git-compat-util.h
parent485cdb9bd8bd7de6c7099c1c3e9c6fca6a60fdd3 (diff)
parent8e848868fff625a8dda92fb11edf2b7975827e1a (diff)
downloadgit-44bc573436c98b7c6cd798af04c538f6e76f0f6e.tar.gz
Merge branch 'maint'
* maint: Start preparing for 1.7.4.4 pull: do not clobber untracked files on initial pull compat: add missing #include <sys/resource.h> Conflicts: RelNotes
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 49b50eec86..40498b33c9 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -118,6 +118,7 @@
#endif
#ifndef __MINGW32__
#include <sys/wait.h>
+#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <termios.h>