some consolidation of #ifdefs

Author: Daniel Kroening

src/goto-programs/format_strings.h

@@ -6,8 +6,8 @@ Author: CM Wintersteiger
 
 \*******************************************************************/
 
-#ifndef CPROVER_GOTO_PROGRAMS_FORMAT_STRINGS_H_
-#define CPROVER_GOTO_PROGRAMS_FORMAT_STRINGS_H_
+#ifndef CPROVER_GOTO_PROGRAMS_FORMAT_STRINGS_H
+#define CPROVER_GOTO_PROGRAMS_FORMAT_STRINGS_H
 
 #include <string>
 #include <list>

src/goto-programs/goto_program_irep.h

@@ -8,8 +8,8 @@ Date: May 2007
 
 \*******************************************************************/
 
-#ifndef GOTO_PROGRAM_IREP_H_
-#define GOTO_PROGRAM_IREP_H_
+#ifndef GOTO_PROGRAM_IREP_H
+#define GOTO_PROGRAM_IREP_H
 
 #include <goto-programs/goto_program.h>
 
@@ -19,4 +19,4 @@ void convert(const irept &irep, goto_programt::instructiont &instruction);
 void convert(const goto_programt &program, irept &irep);
 void convert(const irept &irep, goto_programt &program);
 
-#endif /*GOTO_PROGRAM_IREP_H_*/
+#endif /* GOTO_PROGRAM_IREP_H */

src/goto-programs/loop_ids.h

@@ -6,8 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#ifndef CPROVER_CBMC_LOOP_IDS_H
-#define CPROVER_CBMC_LOOP_IDS_H
+#ifndef CPROVER_LOOP_IDS_H
+#define CPROVER_LOOP_IDS_H
 
 #include <util/ui_message.h>
 

src/goto-programs/remove_complex.h

@@ -8,8 +8,8 @@ Date:   September 2014
 
 \*******************************************************************/
 
-#ifndef CPROVER_COMPLEX_H
-#define CPROVER_COMPLEX_H
+#ifndef CPROVER_REMOVE_COMPLEX_H
+#define CPROVER_REMOVE_COMPLEX_H
 
 #include <goto-programs/goto_model.h>
 

src/goto-programs/remove_function_pointers.h

@@ -8,8 +8,8 @@ Date: June 2003
 
 \*******************************************************************/
 
-#ifndef CPROVER_GOTO_FUNCTION_POINTERS_H
-#define CPROVER_GOTO_FUNCTION_POINTERS_H
+#ifndef CPROVER_REMOVE_FUNCTION_POINTERS_H
+#define CPROVER_REMOVE_FUNCTION_POINTERS_H
 
 #include "goto_model.h"
 

src/goto-programs/remove_returns.h

@@ -8,8 +8,8 @@ Date:   September 2009
 
 \*******************************************************************/
 
-#ifndef CPROVER_REMOVE_RETURN_VALUES_H
-#define CPROVER_REMOVE_RETURN_VALUES_H
+#ifndef CPROVER_REMOVE_RETURNS_H
+#define CPROVER_REMOVE_RETURNS_H
 
 #include <goto-programs/goto_model.h>
 

src/goto-programs/write_goto_binary.h

@@ -6,8 +6,8 @@ Author: CM Wintersteiger
 
 \*******************************************************************/
 
-#ifndef CPROVER_GOTO_PROGRAMS_WRITE_GOTO_BINARY_H_
-#define CPROVER_GOTO_PROGRAMS_WRITE_GOTO_BINARY_H_
+#ifndef CPROVER_GOTO_PROGRAMS_WRITE_GOTO_BINARY_H
+#define CPROVER_GOTO_PROGRAMS_WRITE_GOTO_BINARY_H
 
 #define GOTO_BINARY_VERSION 3