changeset 2:b97ffa8e4019

multiple inclusion guards in .h files
author John W. Eaton <jwe@octave.org>
date Wed, 22 May 2019 16:20:52 -0400
parents 08df60a01bc1
children 52c033864347
files gui-main.h main.h parse.h tty-main.h
diffstat 4 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui-main.h	Mon May 20 13:45:58 2019 -0400
+++ b/gui-main.h	Wed May 22 16:20:52 2019 -0400
@@ -1,5 +1,5 @@
-#if ! defined (gui_main_h)
-#define gui_main_h 1
+#if ! defined (calc_gui_main_h)
+#define calc_gui_main_h 1
 
 #include <iostream>
 #include <sstream>
--- a/main.h	Mon May 20 13:45:58 2019 -0400
+++ b/main.h	Wed May 22 16:20:52 2019 -0400
@@ -1,5 +1,10 @@
+#if ! defined (calc_main_h)
+#define calc_main_h 1
+
 namespace calc
 {
   extern bool tty_mode;
   extern bool debug_mode;
 }
+
+#endif
--- a/parse.h	Mon May 20 13:45:58 2019 -0400
+++ b/parse.h	Wed May 22 16:20:52 2019 -0400
@@ -1,3 +1,6 @@
+#if ! defined (calc_parse_h)
+#define calc_parse_h 1
+
 namespace interpreter
 {
   extern bool beg_of_stmt;
@@ -11,3 +14,5 @@
 
   extern void emit_result (double value);
 }
+
+#endif
--- a/tty-main.h	Mon May 20 13:45:58 2019 -0400
+++ b/tty-main.h	Wed May 22 16:20:52 2019 -0400
@@ -1,3 +1,6 @@
+#if ! defined (calc_tty_main_h)
+#define calc_tty_main_h 1
+
 namespace tty
 {
   extern int main (int argc, char **argv);
@@ -5,3 +8,5 @@
   extern void emit_result (double value);
   extern void emit_error (const char *msg);
 }
+
+#endif