Merge pull request #19 from willfurnass/add_missing_def_to_toolkit_h

Add EN_LINKPATTERN to epanet2.h as hotfix to master
OpenWaterAnalytics · Jul 31, 2015 · 350d32c · 350d32c
2 parents 87a8aaa + b245f4a
commit 350d32c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
 

diff --git 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
+#endif //TOOLKIT_H