From 219e46a4674e85c05ae86b71fc7402a5da8a4c42 Mon Sep 17 00:00:00 2001
From: Marios Kyriakou <mariosmsk@gmail.com>
Date: Thu, 23 Aug 2018 14:54:48 +0300
Subject: [PATCH] Revert "remove dublicate definition"

This reverts commit 1f4c3a0819bc5f53fe781edc1c9af9462ad7ef51.
---
 run/main.c |  7 ++++++-
 src/text.h | 10 +++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/run/main.c b/run/main.c
index f227616..bda132f 100644
--- a/run/main.c
+++ b/run/main.c
@@ -1,10 +1,15 @@
 #include <stdio.h>
 #include <string.h>
-#include <text.h>
 #include "epanet2.h"
 
 #define   MAXMSG         255       /* Max. # characters in message text      */
 #define   MAXWARNCODE    99      
+/* text copied here, no more need of include "text.h" */
+#define FMT01  "\nEPANET Version %d.%d.%d"
+#define FMT03  "\n Correct syntax is:\n %s <input file> <output file>\n"
+#define FMT09  "\n\nEPANET completed."
+#define FMT10  "\nEPANET completed. There are warnings."
+#define FMT11  "\nEPANET completed. There are errors."
 
 
 void  writeConsole(char *s);
diff --git a/src/text.h b/src/text.h
index ffc3991..85159a9 100755
--- a/src/text.h
+++ b/src/text.h
@@ -338,17 +338,17 @@ AUTHOR:     L. Rossman
 "*                         Version %d.%d                            *"
 #define LOGO6  \
 "******************************************************************"
-#define FMT01  "\nEPANET Version %d.%d.%d"
+#define FMT01  "\n... EPANET Version %d.%d\n"
 #define FMT02  "\n  o Retrieving network data"
-#define FMT03 "\nUsage:\n %s <input_filename> <report_filename> [<binary_filename>]\n"
+#define FMT03  "\n Correct syntax is:\n %s <input file> <output file>\n"
 #define FMT04  "\n    Cannot use duplicate file names."
 #define FMT05  "\n    Cannot open input file "
 #define FMT06  "\n    Cannot open report file "
 #define FMT07  "\n    Cannot open output file "
 #define FMT08  "\n    Cannot open temporary output file"
-#define FMT09  "\n\nEPANET completed.\n"
-#define FMT10  "\n\nEPANET completed. There are warnings.\n"
-#define FMT11  "\n\nEPANET completed. There are errors.\n"
+#define FMT09  "\n\n... EPANET completed.\n"
+#define FMT10  "\n\n... EPANET completed. There are warnings.\n"
+#define FMT11  "\n\n... EPANET completed. There are errors.\n"
 #define FMT14  "\n  o Computing hydraulics at hour "
 #define FMT15  "\n  o Computing water quality at hour "
 #define FMT16  "\n  o Transferring results to file"