Author: mlandres Date: Wed Nov 21 12:19:46 2007 New Revision: 7877 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7877&view=rev Log: use SATSOLVER_ prefix in include guards Modified: trunk/sat-solver/src/bitmap.h trunk/sat-solver/src/evr.h trunk/sat-solver/src/hash.h trunk/sat-solver/src/pool.h trunk/sat-solver/src/poolarch.h trunk/sat-solver/src/poolid.h trunk/sat-solver/src/poolid_private.h trunk/sat-solver/src/pooltypes.h trunk/sat-solver/src/poolvendor.h trunk/sat-solver/src/queue.h trunk/sat-solver/src/repo.h trunk/sat-solver/src/repo_solv.h trunk/sat-solver/src/solvable.h trunk/sat-solver/src/solver.h trunk/sat-solver/src/strpool.h trunk/sat-solver/src/util.h Modified: trunk/sat-solver/src/bitmap.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/bitmap.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/bitmap.h (original) +++ trunk/sat-solver/src/bitmap.h Wed Nov 21 12:19:46 2007 @@ -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_free(Map *m); extern void map_clone(Map *t, Map *s); -#endif /* BITMAP_H */ +#endif /* SATSOLVER_BITMAP_H */ Modified: trunk/sat-solver/src/evr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/evr.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/evr.h (original) +++ trunk/sat-solver/src/evr.h Wed Nov 21 12:19:46 2007 @@ -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 @@ } #endif -#endif /* EVR_H */ +#endif /* SATSOLVER_EVR_H */ Modified: trunk/sat-solver/src/hash.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/hash.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/hash.h (original) +++ trunk/sat-solver/src/hash.h Wed Nov 21 12:19:46 2007 @@ -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 @@ return num * 2 - 1; } -#endif /* HASH_H */ +#endif /* SATSOLVER_HASH_H */ Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Wed Nov 21 12:19:46 2007 @@ -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 @@ } #endif -#endif /* POOL_H */ +#endif /* SATSOLVER_POOL_H */ Modified: trunk/sat-solver/src/poolarch.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolarch.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/poolarch.h (original) +++ trunk/sat-solver/src/poolarch.h Wed Nov 21 12:19:46 2007 @@ -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 */ Modified: trunk/sat-solver/src/poolid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolid.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/poolid.h (original) +++ trunk/sat-solver/src/poolid.h Wed Nov 21 12:19:46 2007 @@ -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_rels(Pool *pool); extern void pool_freeidhashes(Pool *pool); -#endif /* POOLID_H */ +#endif /* SATSOLVER_POOLID_H */ Modified: trunk/sat-solver/src/poolid_private.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolid_private.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/poolid_private.h (original) +++ trunk/sat-solver/src/poolid_private.h Wed Nov 21 12:19:46 2007 @@ -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 */ Modified: trunk/sat-solver/src/pooltypes.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pooltypes.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/pooltypes.h (original) +++ trunk/sat-solver/src/pooltypes.h Wed Nov 21 12:19:46 2007 @@ -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 @@ // offset value, e.g. used to 'point' into the stringspace typedef unsigned int Offset; -#endif /* POOLTYPES_H */ +#endif /* SATSOLVER_POOLTYPES_H */ Modified: trunk/sat-solver/src/poolvendor.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolvendor.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/poolvendor.h (original) +++ trunk/sat-solver/src/poolvendor.h Wed Nov 21 12:19:46 2007 @@ -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 */ Modified: trunk/sat-solver/src/queue.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/queue.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/queue.h (original) +++ trunk/sat-solver/src/queue.h Wed Nov 21 12:19:46 2007 @@ -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_buffer(Queue *q, Id *buf, int size); extern void queue_free(Queue *q); -#endif /* QUEUE_H */ +#endif /* SATSOLVER_QUEUE_H */ Modified: trunk/sat-solver/src/repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/repo.h (original) +++ trunk/sat-solver/src/repo.h Wed Nov 21 12:19:46 2007 @@ -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 @@ 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 */ Modified: trunk/sat-solver/src/repo_solv.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/repo_solv.h (original) +++ trunk/sat-solver/src/repo_solv.h Wed Nov 21 12:19:46 2007 @@ -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 @@ } #endif -#endif /* REPO_SOLVE_H */ +#endif /* SATSOLVER_REPO_SOLVE_H */ Modified: trunk/sat-solver/src/solvable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solvable.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/solvable.h (original) +++ trunk/sat-solver/src/solvable.h Wed Nov 21 12:19:46 2007 @@ -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 @@ Offset freshens; } Solvable; -#endif /* SOLVABLE_H */ +#endif /* SATSOLVER_SOLVABLE_H */ Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Wed Nov 21 12:19:46 2007 @@ -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 @@ return 0; } -#endif /* SOLVER_H */ +#endif /* SATSOLVER_SOLVER_H */ Modified: trunk/sat-solver/src/strpool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/strpool.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/strpool.h (original) +++ trunk/sat-solver/src/strpool.h Wed Nov 21 12:19:46 2007 @@ -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" Modified: trunk/sat-solver/src/util.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/util.h?rev=7877&r1=7876&r2=7877&view=diff ============================================================================== --- trunk/sat-solver/src/util.h (original) +++ trunk/sat-solver/src/util.h Wed Nov 21 12:19:46 2007 @@ -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 *xrealloc2(void *, size_t, size_t); extern void *xfree(void *); -#endif /* UTIL_H */ +#endif /* SATSOLVER_UTIL_H */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org