commit bd854ac71fe7045b74accc57b5e1933b411033be
parent 2809fd3795e8445f686547d08eef4631efc05030
Author: sin <sin@2f30.org>
Date: Wed, 6 Jan 2016 17:05:46 +0000
Always use the compat functions
Diffstat:
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
@@ -21,6 +21,11 @@ DOC = \
TODO
HDR = compat.h
+COMPATOBJ = \
+ reallocarray.o\
+ strlcat.o\
+ strlcpy.o
+
OBJ = ${SRC:.c=.o} ${COMPATOBJ}
all: $(BIN)
diff --git a/compat.h b/compat.h
@@ -1,8 +1,6 @@
-#ifdef COMPAT
#undef strlcat
size_t strlcat(char *, const char *, size_t);
#undef strlcpy
size_t strlcpy(char *, const char *, size_t);
#undef reallocarray
void *reallocarray(void *, size_t, size_t);
-#endif
diff --git a/config.mk b/config.mk
@@ -26,10 +26,5 @@ LDFLAGS = ${LIBS}
# -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_BSD_SOURCE ${INCS}
#LDFLAGS = -static -s ${LIBS}
-# uncomment for compat
-CFLAGS += -DCOMPAT
-# uncomment if your libc doesn't support reallocarray, strlcat, strlcpy.
-COMPATOBJ = reallocarray.o strlcat.o strlcpy.o
-
# compiler and linker
#CC = cc
