summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-21 11:02:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-21 11:02:17 (GMT)
commit455bda993cceb42921c9ff173da26651f1d66602 (patch)
tree4e3fd6c8f85e1dbb70d8ea6356b569b0bb9c7e80 /git-compat-util.h
parent1bdd46cd3a2fe1e0aeb965fb0edb493064e24495 (diff)
parentbb15e38281aab342a0e3ca7d5663b0c3f9d5e72e (diff)
downloadgit-455bda993cceb42921c9ff173da26651f1d66602.zip
git-455bda993cceb42921c9ff173da26651f1d66602.tar.gz
git-455bda993cceb42921c9ff173da26651f1d66602.tar.bz2
Merge branch 'cw/maint-exec-defpath'
* cw/maint-exec-defpath: autoconf: Check if <paths.h> exists and set HAVE_PATHS_H exec_cmd.c: replace hard-coded path list with one from <paths.h>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 001e5db..edf352d 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -164,6 +164,13 @@ extern char *gitbasename(char *);
#define PATH_SEP ':'
#endif
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+#ifndef _PATH_DEFPATH
+#define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin"
+#endif
+
#ifndef STRIP_EXTENSION
#define STRIP_EXTENSION ""
#endif