Imported Upstream version 0.6.23

[platform/upstream/libsolv.git] / src / pooltypes.h

diff --git a/src/pooltypes.h b/src/pooltypes.h
index 16823b9..64a3b87 100644 (file)
--- a/src/pooltypes.h
+++ b/src/pooltypes.h
@@ -7,11 +7,11 @@
 
 /*
  * pooltypes.h
- * 
+ *
  */
 
-#ifndef SATSOLVER_POOLTYPES_H
-#define SATSOLVER_POOLTYPES_H
+#ifndef LIBSOLV_POOLTYPES_H
+#define LIBSOLV_POOLTYPES_H
 
 /* format version number for .solv files */
 #define SOLV_VERSION_0 0
@@ -24,19 +24,8 @@
 #define SOLV_VERSION_7 7
 #define SOLV_VERSION_8 8
 
-/* The format of .solv files might change incompatibly, and that is described
-   by the above version number.  But sometimes we also extend the emitted
-   attributes (e.g. by adding a new one for solvables, for instance patch
-   category).  Consumers need to know if the .solv file they have needs to
-   be regenerated by newer converters or not (or better, if regenerating them
-   would give a different .solv file).  We use this serial number for that.
-   We increase it every time we add or remove attributes (or change the
-   interpretation of them).  Tools installed by the user will have their
-   version compiled in, so they can detect mismatches between .solv files
-   they see and themself.  */
-#define SOLV_CONTENT_VERSION 1
-
 #define SOLV_FLAG_PREFIX_POOL 4
+#define SOLV_FLAG_SIZE_BYTES  8
 
 struct _Stringpool;
 typedef struct _Stringpool Stringpool;
@@ -44,10 +33,10 @@ typedef struct _Stringpool Stringpool;
 struct _Pool;
 typedef struct _Pool Pool;
 
-// identifier for string values
+/* identifier for string values */
 typedef int Id;                /* must be signed!, since negative Id is used in solver rules to denote negation */
 
-// offset value, e.g. used to 'point' into the stringspace
+/* offset value, e.g. used to 'point' into the stringspace */
 typedef unsigned int Offset;
 
-#endif /* SATSOLVER_POOLTYPES_H */
+#endif /* LIBSOLV_POOLTYPES_H */