Merge branch 'pb/regex' into next
* pb/regex: On some platforms, certain headers need to be included before regex.h
This commit is contained in:
commit
afb28f239f
@ -1,12 +1,12 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2005 Junio C Hamano
|
* Copyright (C) 2005 Junio C Hamano
|
||||||
*/
|
*/
|
||||||
#include <regex.h>
|
|
||||||
|
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
#include "diff.h"
|
#include "diff.h"
|
||||||
#include "diffcore.h"
|
#include "diffcore.h"
|
||||||
|
|
||||||
|
#include <regex.h>
|
||||||
|
|
||||||
static unsigned int contains(struct diff_filespec *one,
|
static unsigned int contains(struct diff_filespec *one,
|
||||||
const char *needle, unsigned long len,
|
const char *needle, unsigned long len,
|
||||||
regex_t *regexp)
|
regex_t *regexp)
|
||||||
|
Loading…
Reference in New Issue
Block a user