Skip to content

Commit

Permalink
AIX compile fix for repo-config.c
Browse files Browse the repository at this point in the history
AIX 5 has a /usr/include/regex.h containing this code:

 #ifdef  _NO_PROTO
 extern  char    *regex();
 extern  char    *regcmp();
 #else /* _NO_PROTO */
 extern  char    *regex(const char *, const char *, ...);
 extern  char    *regcmp(const char *, ...);
 #endif  /* _NO_PROTO */

This means that repo-config.c is trying to redefine the `regex' symbol.
Here is a simple patch that just uses `regexp' as the symbol name instead.

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Amos Waterland authored and Junio C Hamano committed Jan 6, 2006
1 parent 8b32572 commit 0a15217
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions repo-config.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ static const char git_config_set_usage[] =

static char* key = NULL;
static char* value = NULL;
static regex_t* regex = NULL;
static regex_t* regexp = NULL;
static int do_all = 0;
static int do_not_match = 0;
static int seen = 0;

static int show_config(const char* key_, const char* value_)
{
if (!strcmp(key_, key) &&
(regex == NULL ||
(regexp == NULL ||
(do_not_match ^
!regexec(regex, value_, 0, NULL, 0)))) {
!regexec(regexp, value_, 0, NULL, 0)))) {
if (do_all) {
printf("%s\n", value_);
return 0;
Expand Down Expand Up @@ -46,8 +46,8 @@ static int get_value(const char* key_, const char* regex_)
regex_++;
}

regex = (regex_t*)malloc(sizeof(regex_t));
if (regcomp(regex, regex_, REG_EXTENDED)) {
regexp = (regex_t*)malloc(sizeof(regex_t));
if (regcomp(regexp, regex_, REG_EXTENDED)) {
fprintf(stderr, "Invalid pattern: %s\n", regex_);
return -1;
}
Expand All @@ -59,9 +59,9 @@ static int get_value(const char* key_, const char* regex_)
free(value);
}
free(key);
if (regex) {
regfree(regex);
free(regex);
if (regexp) {
regfree(regexp);
free(regexp);
}

if (do_all)
Expand Down

0 comments on commit 0a15217

Please sign in to comment.