diff --git a/Makefile b/Makefile index 7802bd4..30a50ed 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/jsgc.c b/jsgc.c index cd65b03..d5daa40 100644 --- a/jsgc.c +++ b/jsgc.c @@ -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); diff --git a/jsregexp.c b/jsregexp.c index 199fdc2..ecf001d 100644 --- a/jsregexp.c +++ b/jsregexp.c @@ -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) { diff --git a/jsstring.c b/jsstring.c index a5dd7a0..fd60c27 100644 --- a/jsstring.c +++ b/jsstring.c @@ -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) { diff --git a/one.c b/one.c index 2193194..b46cccd 100644 --- a/one.c +++ b/one.c @@ -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" diff --git a/regex.c b/regexp.c similarity index 99% rename from regex.c rename to regexp.c index b35c248..9b46556 100644 --- a/regex.c +++ b/regexp.c @@ -4,7 +4,7 @@ #include #include -#include "regex.h" +#include "regexp.h" #include "utf.h" #define emit regemit diff --git a/regex.h b/regexp.h similarity index 94% rename from regex.h rename to regexp.h index 3164a46..92a7fca 100644 --- a/regex.h +++ b/regexp.h @@ -1,5 +1,5 @@ -#ifndef regex_h -#define regex_h +#ifndef regexp_h +#define regexp_h #define regcomp js_regcomp #define regexec js_regexec