Imported Upstream version 0.7.11

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

diff --git a/src/dirpool.h b/src/dirpool.h
index 189156f..ca92954 100644 (file)
--- a/src/dirpool.h
+++ b/src/dirpool.h
@@ -4,14 +4,18 @@
  * This program is licensed under the BSD license, read LICENSE.BSD
  * for further information
  */
-#ifndef SATSOLVER_DIRPOOL_H
-#define SATSOLVER_DIRPOOL_H
+#ifndef LIBSOLV_DIRPOOL_H
+#define LIBSOLV_DIRPOOL_H
 
 
 #include "pooltypes.h"
 #include "util.h"
 
-typedef struct _Dirpool {
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct s_Dirpool {
   Id *dirs;
   int ndirs;
   Id *dirtraverse;
@@ -64,7 +68,7 @@ dirpool_child(Dirpool *dp, Id did)
 static inline void
 dirpool_free_dirtraverse(Dirpool *dp)
 {
-  sat_free(dp->dirtraverse);
+  solv_free(dp->dirtraverse);
   dp->dirtraverse = 0;
 }
 
@@ -74,4 +78,8 @@ dirpool_compid(Dirpool *dp, Id did)
   return dp->dirs[did];
 }
 
-#endif /* SATSOLVER_DIRPOOL_H */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBSOLV_DIRPOOL_H */