Fixed identifiers used in ifdefs to (1) not use reserved names and (2) use a consistent naming convention

16 files changed, 35 insertions, 35 deletions

diff --git a/include/klee/Internal/ADT/ImmutableMap.h b/include/klee/Internal/ADT/ImmutableMap.h
index 3c408246..cd0990ae 100644
--- a/include/klee/Internal/ADT/ImmutableMap.h
+++ b/include/klee/Internal/ADT/ImmutableMap.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_IMMUTABLEMAP_H__
-#define __UTIL_IMMUTABLEMAP_H__
+#ifndef KLEE_IMMUTABLEMAP_H
+#define KLEE_IMMUTABLEMAP_H
 
 #include <functional>
 
diff --git a/include/klee/Internal/ADT/ImmutableSet.h b/include/klee/Internal/ADT/ImmutableSet.h
index e60a1d2a..3c27ede0 100644
--- a/include/klee/Internal/ADT/ImmutableSet.h
+++ b/include/klee/Internal/ADT/ImmutableSet.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_IMMUTABLESET_H__
-#define __UTIL_IMMUTABLESET_H__
+#ifndef KLEE_IMMUTABLESET_H
+#define KLEE_IMMUTABLESET_H
 
 #include <functional>
 
diff --git a/include/klee/Internal/ADT/ImmutableTree.h b/include/klee/Internal/ADT/ImmutableTree.h
index 4e6d530f..7ea81832 100644
--- a/include/klee/Internal/ADT/ImmutableTree.h
+++ b/include/klee/Internal/ADT/ImmutableTree.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_IMMUTABLETREE_H__
-#define __UTIL_IMMUTABLETREE_H__
+#ifndef KLEE_IMMUTABLETREE_H
+#define KLEE_IMMUTABLETREE_H
 
 #include <cassert>
 #include <vector>
diff --git a/include/klee/Internal/ADT/KTest.h b/include/klee/Internal/ADT/KTest.h
index c6586f9e..b77ffac5 100644
--- a/include/klee/Internal/ADT/KTest.h
+++ b/include/klee/Internal/ADT/KTest.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __COMMON_KTEST_H__
-#define __COMMON_KTEST_H__
+#ifndef KLEE_KTEST_H
+#define KLEE_KTEST_H
 
 
 #ifdef __cplusplus
diff --git a/include/klee/Internal/ADT/MapOfSets.h b/include/klee/Internal/ADT/MapOfSets.h
index a5acb059..fe635f07 100644
--- a/include/klee/Internal/ADT/MapOfSets.h
+++ b/include/klee/Internal/ADT/MapOfSets.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_MAPOFSETS_H__
-#define __UTIL_MAPOFSETS_H__
+#ifndef KLEE_MAPOFSETS_H
+#define KLEE_MAPOFSETS_H
 
 #include <cassert>
 #include <vector>
diff --git a/include/klee/Internal/ADT/TreeStream.h b/include/klee/Internal/ADT/TreeStream.h
index 1494aa76..0b8b17dc 100644
--- a/include/klee/Internal/ADT/TreeStream.h
+++ b/include/klee/Internal/ADT/TreeStream.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_TREESTREAM_H__
-#define __UTIL_TREESTREAM_H__
+#ifndef KLEE_TREESTREAM_H
+#define KLEE_TREESTREAM_H
 
 #include <string>
 #include <vector>
diff --git a/include/klee/Internal/Support/ErrorHandling.h b/include/klee/Internal/Support/ErrorHandling.h
index 29451692..1fb29935 100644
--- a/include/klee/Internal/Support/ErrorHandling.h
+++ b/include/klee/Internal/Support/ErrorHandling.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __KLEE_ERROR_HANDLING_H__
-#define __KLEE_ERROR_HANDLING_H__
+#ifndef KLEE_ERROR_HANDLING_H
+#define KLEE_ERROR_HANDLING_H
 
 #ifdef __CYGWIN__
 #ifndef WINDOWS
@@ -48,4 +48,4 @@ void klee_warning_once(const void *id, const char *msg, ...)
     __attribute__((format(printf, 2, 3)));
 }
 
-#endif /* __KLEE_ERROR_HANDLING_H__ */
+#endif /* KLEE_ERROR_HANDLING_H */
diff --git a/include/klee/klee.h b/include/klee/klee.h
index 2446fc07..99fe15c7 100644
--- a/include/klee/klee.h
+++ b/include/klee/klee.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===*/
 
-#ifndef __KLEE_H__
-#define __KLEE_H__
+#ifndef KLEE_H
+#define KLEE_H
 
 #include "stdint.h"
 #include "stddef.h"
@@ -156,4 +156,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __KLEE_H__ */
+#endif /* KLEE_H */
diff --git a/include/klee/util/ArrayExprHash.h b/include/klee/util/ArrayExprHash.h
index e353881f..43c391f5 100644
--- a/include/klee/util/ArrayExprHash.h
+++ b/include/klee/util/ArrayExprHash.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_ARRAYEXPRHASH_H__
-#define __UTIL_ARRAYEXPRHASH_H__
+#ifndef KLEE_ARRAYEXPRHASH_H
+#define KLEE_ARRAYEXPRHASH_H
 
 #include "klee/Expr.h"
 #include "klee/TimerStatIncrementer.h"
diff --git a/lib/Core/CallPathManager.h b/lib/Core/CallPathManager.h
index 0a648777..a39bc387 100644
--- a/lib/Core/CallPathManager.h
+++ b/lib/Core/CallPathManager.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_CALLPATHMANAGER_H__
-#define __UTIL_CALLPATHMANAGER_H__
+#ifndef KLEE_CALLPATHMANAGER_H
+#define KLEE_CALLPATHMANAGER_H
 
 #include "klee/Statistics.h"
 
diff --git a/lib/Core/PTree.h b/lib/Core/PTree.h
index faa65d85..b15987d5 100644
--- a/lib/Core/PTree.h
+++ b/lib/Core/PTree.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_PTREE_H__
-#define __UTIL_PTREE_H__
+#ifndef KLEE_PTREE_H
+#define KLEE_PTREE_H
 
 #include <klee/Expr.h>
 
diff --git a/lib/Solver/ConstantDivision.h b/lib/Solver/ConstantDivision.h
index 9e3e9c95..3b3a2799 100644
--- a/lib/Solver/ConstantDivision.h
+++ b/lib/Solver/ConstantDivision.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_CONSTANTDIVISION_H__
-#define __UTIL_CONSTANTDIVISION_H__
+#ifndef KLEE_CONSTANTDIVISION_H
+#define KLEE_CONSTANTDIVISION_H
 
 #include <stdint.h>
 
diff --git a/lib/Solver/STPBuilder.h b/lib/Solver/STPBuilder.h
index 5be34029..f4b2ffc6 100644
--- a/lib/Solver/STPBuilder.h
+++ b/lib/Solver/STPBuilder.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_STPBUILDER_H__
-#define __UTIL_STPBUILDER_H__
+#ifndef KLEE_STPBUILDER_H
+#define KLEE_STPBUILDER_H
 
 #include "klee/util/ExprHashMap.h"
 #include "klee/util/ArrayExprHash.h"
diff --git a/lib/Solver/Z3Builder.h b/lib/Solver/Z3Builder.h
index 7cdb2b5e..7057176e 100644
--- a/lib/Solver/Z3Builder.h
+++ b/lib/Solver/Z3Builder.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __UTIL_Z3BUILDER_H__
-#define __UTIL_Z3BUILDER_H__
+#ifndef KLEE_Z3BUILDER_H
+#define KLEE_Z3BUILDER_H
 
 #include "klee/Config/config.h"
 #include "klee/util/ArrayExprHash.h"
diff --git a/runtime/POSIX/fd.h b/runtime/POSIX/fd.h
index 067f217e..a5e15c9b 100644
--- a/runtime/POSIX/fd.h
+++ b/runtime/POSIX/fd.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __EXE_FD__
-#define __EXE_FD__
+#ifndef KLEE_FD_H
+#define KLEE_FD_H
 
 #include "klee/Config/config.h"
 
@@ -108,4 +108,4 @@ int __fd_ftruncate(int fd, off64_t length);
 int __fd_statfs(const char *path, struct statfs *buf);
 int __fd_getdents(unsigned int fd, struct dirent64 *dirp, unsigned int count);
 
-#endif /* __EXE_FD__ */
+#endif /* KLEE_FD_H */
diff --git a/tools/klee-replay/klee-replay.h b/tools/klee-replay/klee-replay.h
index 09cb6603..b4d0f248 100644
--- a/tools/klee-replay/klee-replay.h
+++ b/tools/klee-replay/klee-replay.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __KLEE_REPLAY_H__
-#define __KLEE_REPLAY_H__
+#ifndef KLEE_REPLAY_H
+#define KLEE_REPLAY_H
 
 #define _LARGEFILE64_SOURCE
 #define _FILE_OFFSET_BITS 64