use SATSOLVER_ prefix in include guards

diff --git a/src/bitmap.h b/src/bitmap.h
index 2f2417616d73d8c085b03fffa62e5fbfc9638002..5c78c160b40c90d317733c38830c5f827d071e18 100644 (file)
--- a/src/bitmap.h
+++ b/src/bitmap.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef BITMAP_H
-#define BITMAP_H
+#ifndef SATSOLVER_BITMAP_H
+#define SATSOLVER_BITMAP_H
 
 typedef struct _Map {
   unsigned char *map;
@@ -27,4 +27,4 @@ extern void map_init(Map *m, int n);
 extern void map_free(Map *m);
 extern void map_clone(Map *t, Map *s);
 
-#endif /* BITMAP_H */
+#endif /* SATSOLVER_BITMAP_H */

diff --git a/src/evr.h b/src/evr.h
index 48227fd18bcdf7a8d86a63a0926267275f9e5972..5fe0c9d1459b65bee043fc6535b3b6eaf271f6b5 100644 (file)
--- a/src/evr.h
+++ b/src/evr.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef EVR_H
-#define EVR_H
+#ifndef SATSOLVER_EVR_H
+#define SATSOLVER_EVR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,4 +26,4 @@ extern int evrcmp( Pool *pool, Id evr1id, Id evr2id );
 }
 #endif
 
-#endif /* EVR_H */
+#endif /* SATSOLVER_EVR_H */

diff --git a/src/hash.h b/src/hash.h
index 6e1c4dee4320c36bdf8716278549305983be2827..731a3e7077851ecdffc58366d3c8a97b3524b938 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -10,8 +10,8 @@
  * generic hash functions
  */
 
-#ifndef HASH_H
-#define HASH_H
+#ifndef SATSOLVER_HASH_H
+#define SATSOLVER_HASH_H
 
 #include "pooltypes.h"
 
@@ -65,4 +65,4 @@ mkmask(unsigned int num)
   return num * 2 - 1;
 }
 
-#endif /* HASH_H */
+#endif /* SATSOLVER_HASH_H */

diff --git a/src/pool.h b/src/pool.h
index 62cf80d3240e69b141199285a2a841229148e8ec..7c229a40fa3038c9a7e78769766a384ccbb78033 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef POOL_H
-#define POOL_H
+#ifndef SATSOLVER_POOL_H
+#define SATSOLVER_POOL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -189,4 +189,4 @@ static inline Id *pool_whatprovides(Pool *pool, Id d)
 }
 #endif
 
-#endif /* POOL_H */
+#endif /* SATSOLVER_POOL_H */

diff --git a/src/poolarch.h b/src/poolarch.h
index 017f1e62a44654ab86751ce6d55b9c7995a394e3..9019d6affd1e54341690221bcf154cb5481a493a 100644 (file)
--- a/src/poolarch.h
+++ b/src/poolarch.h
@@ -5,11 +5,11 @@
  * for further information
  */
 
-#ifndef POOLARCH_H
-#define POOLARCH_H
+#ifndef SATSOLVER_POOLARCH_H
+#define SATSOLVER_POOLARCH_H
 
 #include "pool.h"
 
 extern void pool_setarch(Pool *, const char *);
 
-#endif /* POOLARCH_H */
+#endif /* SATSOLVER_POOLARCH_H */

diff --git a/src/poolid.h b/src/poolid.h
index 069ecb5cd092f45d0b8b760b9f68d2f6744cecaf..7ea597ce2c392dff83c90bd31611a808c1b50d28 100644 (file)
--- a/src/poolid.h
+++ b/src/poolid.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef POOLID_H
-#define POOLID_H
+#ifndef SATSOLVER_POOLID_H
+#define SATSOLVER_POOLID_H
 
 #include "pooltypes.h"
 #include "hash.h"
@@ -36,4 +36,4 @@ extern void pool_shrink_strings(Pool *pool);
 extern void pool_shrink_rels(Pool *pool);
 extern void pool_freeidhashes(Pool *pool);
 
-#endif /* POOLID_H */
+#endif /* SATSOLVER_POOLID_H */

diff --git a/src/poolid_private.h b/src/poolid_private.h
index 374b9919a4577920a45a5a9a8cacda2083916546..4a2ed8be9d7b532838dce33605fd8f75d56f367e 100644 (file)
--- a/src/poolid_private.h
+++ b/src/poolid_private.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef POOLID_PRIVATE_H
-#define POOLID_PRIVATE_H
+#ifndef SATSOLVER_POOLID_PRIVATE_H
+#define SATSOLVER_POOLID_PRIVATE_H
 
 // the size of all buffers is incremented in blocks
 // these are the block values (increment values) for the
@@ -19,4 +19,4 @@
 // 
 #define REL_BLOCK         1023          // hashtable for relations
 
-#endif /* POOLID_PRIVATE_H */
+#endif /* SATSOLVER_POOLID_PRIVATE_H */

diff --git a/src/pooltypes.h b/src/pooltypes.h
index f3bc1946f7e8d24897088c66d20280264f0440c4..08a1df4d509dc03972ad506adee366139096818e 100644 (file)
--- a/src/pooltypes.h
+++ b/src/pooltypes.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef POOLTYPES_H
-#define POOLTYPES_H
+#ifndef SATSOLVER_POOLTYPES_H
+#define SATSOLVER_POOLTYPES_H
 
 /* version number for .solv files */
 #define SOLV_VERSION 0
@@ -28,4 +28,4 @@ typedef int Id;               /* must be signed!, since negative Id is used in solver rules t
 // offset value, e.g. used to 'point' into the stringspace
 typedef unsigned int Offset;
 
-#endif /* POOLTYPES_H */
+#endif /* SATSOLVER_POOLTYPES_H */

diff --git a/src/poolvendor.h b/src/poolvendor.h
index 6f0af692fa26b6a52e27a476398ad540a508267b..ad3ee47fa0ba2001b40404cd03227b06efd0e07b 100644 (file)
--- a/src/poolvendor.h
+++ b/src/poolvendor.h
@@ -5,11 +5,11 @@
  * for further information
  */
 
-#ifndef POOLVENDOR_H
-#define POOLVENDOR_H
+#ifndef SATSOLVER_POOLVENDOR_H
+#define SATSOLVER_POOLVENDOR_H
 
 #include "pool.h"
 
 Id pool_vendor2mask(Pool *pool, Id vendor);
 
-#endif /* POOLVENDOR_H */
+#endif /* SATSOLVER_POOLVENDOR_H */

diff --git a/src/queue.h b/src/queue.h
index 7066820b377a2be2f14c4d5229d3e507e1d5b182..4350d923b0a557f2aa5a4587806cc58b1f3a9395 100644 (file)
--- a/src/queue.h
+++ b/src/queue.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef QUEUE_H
-#define QUEUE_H
+#ifndef SATSOLVER_QUEUE_H
+#define SATSOLVER_QUEUE_H
 
 #include "pooltypes.h"
 
@@ -72,4 +72,4 @@ extern void queue_init(Queue *q);
 extern void queue_init_buffer(Queue *q, Id *buf, int size);
 extern void queue_free(Queue *q);
 
-#endif /* QUEUE_H */
+#endif /* SATSOLVER_QUEUE_H */

diff --git a/src/repo.h b/src/repo.h
index 386e84233e227e0086f2b1923c2f40bc34db876d..44b7f3add2584969308b41c59a8ec8cfdd99e10f 100644 (file)
--- a/src/repo.h
+++ b/src/repo.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef REPO_H
-#define REPO_H
+#ifndef SATSOLVER_REPO_H
+#define SATSOLVER_REPO_H
 
 #include "pooltypes.h"
 #include "pool.h"
@@ -110,4 +110,4 @@ static inline void repo_free_solvable_block(Repo *repo, Id start, int count, int
   for (p = (r)->start, s = (r)->pool->solvables + p; p < (r)->end; p++, s++)   \
     if (s->repo == (r))
 
-#endif /* REPO_H */
+#endif /* SATSOLVER_REPO_H */

diff --git a/src/repo_solv.h b/src/repo_solv.h
index 459e20c3334ac3da88585676d906a47d2fc53c46..6a3bacdac9569df3e1866fbf995e6fd0578ecef9 100644 (file)
--- a/src/repo_solv.h
+++ b/src/repo_solv.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef REPO_SOLVE_H
-#define REPO_SOLVE_H
+#ifndef SATSOLVER_REPO_SOLVE_H
+#define SATSOLVER_REPO_SOLVE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,4 +28,4 @@ extern void repo_add_solv(Repo *repo, FILE *fp);
 }
 #endif
 
-#endif /* REPO_SOLVE_H */
+#endif /* SATSOLVER_REPO_SOLVE_H */

diff --git a/src/solvable.h b/src/solvable.h
index 28d93ab138a98cb1551e5ba4f95d04b92cb2c7c0..785128daf8bc293cbd2a7aadb5190c03817e7d51 100644 (file)
--- a/src/solvable.h
+++ b/src/solvable.h
@@ -11,8 +11,8 @@
  * A solvable represents an object with name-epoch:version-release.arch and dependencies
  */
 
-#ifndef SOLVABLE_H
-#define SOLVABLE_H
+#ifndef SATSOLVER_SOLVABLE_H
+#define SATSOLVER_SOLVABLE_H
 
 #include "pooltypes.h"
 
@@ -41,4 +41,4 @@ typedef struct _Solvable {
   Offset freshens;
 } Solvable;
 
-#endif /* SOLVABLE_H */
+#endif /* SATSOLVER_SOLVABLE_H */

diff --git a/src/solver.h b/src/solver.h
index 6406954d960774610747a91046a82c431a535a2a..ddf148029ba0891ad8e165fedcce3db4c8fd5aab 100644 (file)
--- a/src/solver.h
+++ b/src/solver.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef SOLVER_H
-#define SOLVER_H
+#ifndef SATSOLVER_SOLVER_H
+#define SATSOLVER_SOLVER_H
 
 #include "pooltypes.h"
 #include "pool.h"
@@ -201,4 +201,4 @@ solver_is_enhancing(Solver *solv, Solvable *s)
   return 0;
 }
 
-#endif /* SOLVER_H */
+#endif /* SATSOLVER_SOLVER_H */

diff --git a/src/strpool.h b/src/strpool.h
index 58f7edd02c409ddc299223f73245f358e25f50ec..d326c4fa0d84f79196f1a39ee6ae837e3c431ff1 100644 (file)
--- a/src/strpool.h
+++ b/src/strpool.h
@@ -4,8 +4,8 @@
  * This program is licensed under the BSD license, read LICENSE.BSD
  * for further information
  */
-#ifndef STRINGPOOL_H
-#define STRINGPOOL_H
+#ifndef SATSOLVER_STRINGPOOL_H
+#define SATSOLVER_STRINGPOOL_H
 
 #include "pooltypes.h"
 #include "hash.h"

diff --git a/src/util.h b/src/util.h
index 6eb7809881b842d428240bd47d031f99a08803e5..f6cae59fde4fd94fcd3d5402f7bd8f74ffd49ff6 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -10,8 +10,8 @@
  * 
  */
 
-#ifndef UTIL_H
-#define UTIL_H
+#ifndef SATSOLVER_UTIL_H
+#define SATSOLVER_UTIL_H
 
 extern void *xmalloc(size_t);
 extern void *xmalloc2(size_t, size_t);
@@ -20,4 +20,4 @@ extern void *xrealloc(void *, size_t);
 extern void *xrealloc2(void *, size_t, size_t);
 extern void *xfree(void *);
 
-#endif /* UTIL_H */
+#endif /* SATSOLVER_UTIL_H */