diff --git a/ce/ce.c b/ce/ce.c index 70c485a..0de1ad1 100644 --- a/ce/ce.c +++ b/ce/ce.c @@ -2,13 +2,13 @@ #include "context.h" #include "gapbuffer.h" #include "interp.h" -#include "mprintf.h" #include "strbuf.h" #include #include #include #include #include +#include #include #include #include diff --git a/ce/edit.c b/ce/edit.c index 7355972..128c353 100644 --- a/ce/edit.c +++ b/ce/edit.c @@ -1,13 +1,13 @@ #include "edit.h" #include "arena_alloc.h" #include "gapbuffer.h" -#include "mprintf.h" #include "walloc.h" #include #include #include #include #include +#include #include #include #include diff --git a/ce/interp.c b/ce/interp.c index b398951..d4631f4 100644 --- a/ce/interp.c +++ b/ce/interp.c @@ -2,7 +2,6 @@ #include "arena_alloc.h" #include "context.h" #include "edit.h" -#include "mprintf.h" #include "parser.h" #include #include @@ -12,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/ce/mprintf.h b/ce/mprintf.h deleted file mode 100644 index 094b00a..0000000 --- a/ce/mprintf.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _MPRINTF_H -#define _MPRINTF_H - -#include "context.h" - -#define MPRINTF_BUF_MAX CPRINTF_BUF_MAX - -void mprintf (const char* fmt, ...); - -#endif // _MPRINTF_H diff --git a/ce/parser.c b/ce/parser.c index 7407da3..c89766b 100644 --- a/ce/parser.c +++ b/ce/parser.c @@ -2,9 +2,9 @@ #include "arena_alloc.h" #include "context.h" #include "interp.h" -#include "mprintf.h" #include #include +#include #include static struct parse_rule parse_rules[] = { diff --git a/ce/src.mk b/ce/src.mk index d4e3bee..8c9bfaa 100644 --- a/ce/src.mk +++ b/ce/src.mk @@ -4,7 +4,6 @@ c += ce.c \ context.c \ parser.c \ interp.c \ - mprintf.c \ gapbuffer.c \ edit.c @@ -14,6 +13,5 @@ o += ce.o \ context.o \ parser.o \ interp.o \ - mprintf.o \ gapbuffer.o \ edit.o diff --git a/libaux/Makefile b/libaux/Makefile index fda6efe..8898ee0 100644 --- a/libaux/Makefile +++ b/libaux/Makefile @@ -1,6 +1,9 @@ include ../make/ufuncs.mk $(eval $(call add_include,libsystem)) +$(eval $(call add_include,libmalloc)) +$(eval $(call add_include,libprocess)) +$(eval $(call add_include,libstring)) libname := libaux diff --git a/ce/mprintf.c b/libaux/mprintf.c similarity index 95% rename from ce/mprintf.c rename to libaux/mprintf.c index a58fb9e..28cb2b8 100644 --- a/ce/mprintf.c +++ b/libaux/mprintf.c @@ -1,5 +1,5 @@ -#include "mprintf.h" #include +#include #include #include #include diff --git a/libaux/mprintf.h b/libaux/mprintf.h new file mode 100644 index 0000000..b35328d --- /dev/null +++ b/libaux/mprintf.h @@ -0,0 +1,8 @@ +#ifndef _LIBAUX_MPRINTF_H +#define _LIBAUX_MPRINTF_H + +#define MPRINTF_BUF_MAX (1024 * 16) + +void mprintf (const char* fmt, ...); + +#endif // _LIBAUX_MPRINTF_H diff --git a/libaux/src.mk b/libaux/src.mk index 483f18d..85dea92 100644 --- a/libaux/src.mk +++ b/libaux/src.mk @@ -1,7 +1,9 @@ include $(platform)/src.mk c += printf.c \ - path.c + path.c \ + mprintf.c o += printf.o \ - path.o + path.o \ + mprintf.o