aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-04 17:15:02 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-04 17:15:02 -0700
commitafb28f239ff677cc57fc5dad47c2104537aff922 (patch)
tree666306533933fe1a110fbe583c87c996049c8472
parentMerge branch 'jc/combine' into next (diff)
parentOn some platforms, certain headers need to be included before regex.h (diff)
downloadgit-afb28f239ff677cc57fc5dad47c2104537aff922.tar.gz
git-afb28f239ff677cc57fc5dad47c2104537aff922.zip
Merge branch 'pb/regex' into next
* pb/regex: On some platforms, certain headers need to be included before regex.h
-rw-r--r--diffcore-pickaxe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index d89f314f6d..cfcce315ba 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -1,12 +1,12 @@
/*
* Copyright (C) 2005 Junio C Hamano
*/
-#include <regex.h>
-
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
+#include <regex.h>
+
static unsigned int contains(struct diff_filespec *one,
const char *needle, unsigned long len,
regex_t *regexp)