fix: header extern C and guard

diff --git a/ext/repo_conda.h b/ext/repo_conda.h
index 72ae6425b0b5980737920fd52bf049631d1f1a7e..39911eb0bbb5f3dd0daa40ef39ab931cac40f9c9 100644 (file)
--- a/ext/repo_conda.h
+++ b/ext/repo_conda.h
@@ -5,7 +5,24 @@
  * for further information
  */
 
+#ifndef LIBSOLV_REPO_CONDA_H
+#define LIBSOLV_REPO_CONDA_H
+
+#include <stdio.h>
+
+#include "repo.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define CONDA_ADD_USE_ONLY_TAR_BZ2     (1 << 8)
 #define CONDA_ADD_WITH_SIGNATUREDATA   (1 << 9)
 
 extern int repo_add_conda(Repo *repo, FILE *fp, int flags);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBSOLV_REPO_CONDA_H */

diff --git a/src/conda.h b/src/conda.h
index 3bcfa2d19065bf7b76f86df551328773d0575152..07703be8e12e7299359d09e390b9bd73ffaab873 100644 (file)
--- a/src/conda.h
+++ b/src/conda.h
@@ -13,10 +13,21 @@
 #ifndef LIBSOLV_CONDA_H
 #define LIBSOLV_CONDA_H
 
+#include "pooltypes.h"
+#include "solvable.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int pool_evrcmp_conda(const Pool *pool, const char *evr1, const char *evr2, int mode);
 int solvable_conda_matchversion(Solvable *s, const char *version);
 Id pool_addrelproviders_conda(Pool *pool, Id name, Id evr, Queue *plist);
 Id pool_conda_matchspec(Pool *pool, const char *name);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LIBSOLV_CONDA_H */
 

diff --git a/src/pooltypes.h b/src/pooltypes.h
index c69f3755010eb8253d7dd59aa4c0cb6a3aa82b35..3d686ed0b15b035a226b978f1e00e78aa7259fb4 100644 (file)
--- a/src/pooltypes.h
+++ b/src/pooltypes.h
@@ -13,6 +13,10 @@
 #ifndef LIBSOLV_POOLTYPES_H
 #define LIBSOLV_POOLTYPES_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* format version number for .solv files */
 #define SOLV_VERSION_0 0
 #define SOLV_VERSION_1 1
@@ -42,4 +46,8 @@ 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;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LIBSOLV_POOLTYPES_H */