Rename our internal regex.h to not collide with system regex.h.

This commit is contained in:
Tor Andersson
2015-08-14 12:05:09 +02:00
parent c1ad1ba1e4
commit eed7619158
7 changed files with 9 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
SRCS := $(wildcard js*.c utf*.c regex.c)
HDRS := $(wildcard js*.h mujs.h utf.h regex.h)
SRCS := $(wildcard js*.c utf*.c regexp.c)
HDRS := $(wildcard js*.h mujs.h utf.h regexp.h)
OBJS := $(SRCS:%.c=build/%.o)
prefix ?= /usr/local

2
jsgc.c
View File

@@ -3,7 +3,7 @@
#include "jsvalue.h"
#include "jsrun.h"
#include "regex.h"
#include "regexp.h"
static void jsG_markobject(js_State *J, int mark, js_Object *obj);

View File

@@ -1,7 +1,7 @@
#include "jsi.h"
#include "jsvalue.h"
#include "jsbuiltin.h"
#include "regex.h"
#include "regexp.h"
void js_newregexp(js_State *J, const char *pattern, int flags)
{

View File

@@ -2,7 +2,7 @@
#include "jsvalue.h"
#include "jsbuiltin.h"
#include "utf.h"
#include "regex.h"
#include "regexp.h"
int js_runeat(js_State *J, const char *s, int i)
{

2
one.c
View File

@@ -21,6 +21,6 @@
#include "jsstate.c"
#include "jsstring.c"
#include "jsvalue.c"
#include "regex.c"
#include "regexp.c"
#include "utf.c"
#include "utftype.c"

View File

@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <limits.h>
#include "regex.h"
#include "regexp.h"
#include "utf.h"
#define emit regemit

View File

@@ -1,5 +1,5 @@
#ifndef regex_h
#define regex_h
#ifndef regexp_h
#define regexp_h
#define regcomp js_regcomp
#define regexec js_regexec