Merge pull request #19 from willfurnass/add_missing_def_to_toolkit_h

Add EN_LINKPATTERN to epanet2.h as hotfix to master
This commit is contained in:
Sam Hatchett
2015-07-31 14:44:21 -04:00
3 changed files with 4 additions and 3 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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