From 9088eec6ee02eaa2d98a31400824a62475abbbd4 Mon Sep 17 00:00:00 2001 From: Will Furnass Date: Fri, 31 Jul 2015 18:21:04 +0100 Subject: [PATCH 1/2] Add (missing) EN_LINKQUAL #define to epanet2.h --- include/epanet2.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/epanet2.h b/include/epanet2.h index 6c3a7fa..9b013a1 100755 --- a/include/epanet2.h +++ b/include/epanet2.h @@ -84,6 +84,7 @@ #define EN_SETTING 12 #define EN_ENERGY 13 #define EN_LINKQUAL 14 /* TNT */ +#define EN_LINKPATTERN 15 #define EN_DURATION 0 /* Time parameters */ #define EN_HYDSTEP 1 @@ -258,4 +259,4 @@ extern "C" { } #endif -#endif //TOOLKIT_H \ No newline at end of file +#endif //TOOLKIT_H From b245f4a5a70f1acf4d4c2ce7ee9ec4199819baa3 Mon Sep 17 00:00:00 2001 From: Will Furnass Date: Fri, 31 Jul 2015 18:22:24 +0100 Subject: [PATCH 2/2] Request use of C99 standard in Linux Makefiles --- build/Linux/Makefile | 2 +- build/Linux/Makefile_Rev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Linux/Makefile b/build/Linux/Makefile index d08b6df..01e80cf 100755 --- a/build/Linux/Makefile +++ b/build/Linux/Makefile @@ -54,7 +54,7 @@ docdir = $(datarootdir)/doc/epanet # Compiler and flags CC = gcc -CFLAGS = -g -O3 -fPIC +CFLAGS = -g -O3 -fPIC -std=c99 CPPFLAGS = -I $(epanetincludedir) LDFLAGS = -L . -Wl,-rpath,$(libdir) -lm diff --git a/build/Linux/Makefile_Rev b/build/Linux/Makefile_Rev index 488e471..362725d 100755 --- a/build/Linux/Makefile_Rev +++ b/build/Linux/Makefile_Rev @@ -57,7 +57,7 @@ docdir = $(datarootdir)/doc/epanet # Compiler and flags CC = gcc -CFLAGS = -g -O3 -fPIC +CFLAGS = -g -O3 -fPIC -std=c99 CPPFLAGS = -I $(epanetincludedir) LDFLAGS = -L . -Wl,-rpath,$(libdir) -lm