From 9195552e8fca86b682a86fc7ab0fb6eacb433f16 Mon Sep 17 00:00:00 2001 From: Daniel Gollub Date: Thu, 1 May 2014 14:07:02 +0200 Subject: [PATCH] distinguish internal/ext. builds with FIO_INTERNAL To distinguish between internal and external includes of fio.h and other headers FIO_INTERNAL get applied only for the fio (and gfio) internal build itself. This helps to prevent double-declaration issues by making ambigous declaration with common names coditional based on the FIO_INTERNAL define. Signed-off-by: Daniel Gollub Signed-off-by: Jens Axboe --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e7659c46..a0f0f718 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ include config-host.mak endif DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG -CPPFLAGS= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(DEBUGFLAGS) +CPPFLAGS= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INTERNAL $(DEBUGFLAGS) OPTFLAGS= -O3 -g -ffast-math CFLAGS = -std=gnu99 -Wwrite-strings -Wall -Wdeclaration-after-statement $(OPTFLAGS) $(EXTFLAGS) $(BUILD_CFLAGS) LIBS += -lm $(EXTLIBS) -- 2.25.1