Cleanup any clashes in include protectors

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/_pakfire/capabilities.h b/src/_pakfire/capabilities.h
index 8f820cd5e98b39b37d83ef49c3f5f6b02347d258..d077b43b779716429d4293b6faac91c2888d570a 100644 (file)
--- a/src/_pakfire/capabilities.h
+++ b/src/_pakfire/capabilities.h
@@ -18,12 +18,12 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_CAPS_H
-#define PAKFIRE_CAPS_H
+#ifndef PYTHON_PAKFIRE_CAPS_H
+#define PYTHON_PAKFIRE_CAPS_H
 
 #include <Python.h>
 
 extern PyObject *get_capabilities(PyObject *self, PyObject *args);
 extern PyObject *set_capabilities(PyObject *self, PyObject *args);
 
-#endif
+#endif /* PYTHON_PAKFIRE_CAPS_H */

diff --git a/src/_pakfire/constants.h b/src/_pakfire/constants.h
index dd7988178e9934fa5b3642e3be8cc8ba3f718f16..fbf5832f4580372e76ae9712efeb898f3f0f1b1b 100644 (file)
--- a/src/_pakfire/constants.h
+++ b/src/_pakfire/constants.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef _PAKFIRE_CONSTANTS_H
-#define _PAKFIRE_CONSTANTS_H
+#ifndef PYTHON_PAKFIRE_CONSTANTS_H
+#define PYTHON_PAKFIRE_CONSTANTS_H
 
 #define STRING_SIZE    2048
 
@@ -30,4 +30,4 @@
 #include <libintl.h>
 #define _(x) gettext(x)
 
-#endif
+#endif /* PYTHON_PAKFIRE_CONSTANTS_H */

diff --git a/src/_pakfire/problem.h b/src/_pakfire/problem.h
index f6a97c1b1b6a5463921c104f964540c2cfa59225..22b3b7478332ac3171d91522b07e73ebbeb22274 100644 (file)
--- a/src/_pakfire/problem.h
+++ b/src/_pakfire/problem.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_PROBLEM_H
-#define PAKFIRE_PROBLEM_H
+#ifndef PYTHON_PAKFIRE_PROBLEM_H
+#define PYTHON_PAKFIRE_PROBLEM_H
 
 #include <Python.h>
 
@@ -55,4 +55,4 @@ extern PyObject *Problem_get_solutions(ProblemObject *self);
 
 extern PyTypeObject ProblemType;
 
-#endif
+#endif /* PYTHON_PAKFIRE_PROBLEM_H */

diff --git a/src/_pakfire/relation.h b/src/_pakfire/relation.h
index b4de5ca18133b0d5c527db1681c3f81e6cb8b65e..348fa22ebde2282bdc8ed187cfc5ff689b6a7349 100644 (file)
--- a/src/_pakfire/relation.h
+++ b/src/_pakfire/relation.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_RELATION_H
-#define PAKFIRE_RELATION_H
+#ifndef PYTHON_PAKFIRE_RELATION_H
+#define PYTHON_PAKFIRE_RELATION_H
 
 #include <Python.h>
 
@@ -39,4 +39,4 @@ extern PyObject *Relation_string(RelationObject *self);
 
 extern PyTypeObject RelationType;
 
-#endif
+#endif /* PYTHON_PAKFIRE_RELATION_H */

diff --git a/src/_pakfire/request.h b/src/_pakfire/request.h
index aa792743300b6261f8da8a8d8136bdb825467251..f7c2efe064a6f7343872bbca2fda4d5842d98a01 100644 (file)
--- a/src/_pakfire/request.h
+++ b/src/_pakfire/request.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_REQUEST_H
-#define PAKFIRE_REQUEST_H
+#ifndef PYTHON_PAKFIRE_REQUEST_H
+#define PYTHON_PAKFIRE_REQUEST_H
 
 #include <Python.h>
 
@@ -65,4 +65,4 @@ extern PyObject *Request_verify(RequestObject *self, PyObject *args);
 
 extern PyTypeObject RequestType;
 
-#endif
+#endif /* PYTHON_PAKFIRE_REQUEST_H */

diff --git a/src/_pakfire/solution.h b/src/_pakfire/solution.h
index d5b7fc43ce28c3685e2445b3bf4a81ba95ebe4f2..b49e1518d6685a0a3efe2e0d24de227f0b3f8f1f 100644 (file)
--- a/src/_pakfire/solution.h
+++ b/src/_pakfire/solution.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_SOLUTION_H
-#define PAKFIRE_SOLUTION_H
+#ifndef PYTHON_PAKFIRE_SOLUTION_H
+#define PYTHON_PAKFIRE_SOLUTION_H
 
 #include <Python.h>
 
@@ -40,4 +40,4 @@ extern PyObject *Solution_string(SolutionObject *self);
 
 extern PyTypeObject SolutionType;
 
-#endif
+#endif /* PYTHON_PAKFIRE_SOLUTION_H */

diff --git a/src/_pakfire/solvable.h b/src/_pakfire/solvable.h
index 5d2b28109ef69e042d5f4136cfa1b2b6fee36a2d..caa41bc9458f2ec842bd1310392f56d198dd25b5 100644 (file)
--- a/src/_pakfire/solvable.h
+++ b/src/_pakfire/solvable.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_SOLVABLE_H
-#define PAKFIRE_SOLVABLE_H
+#ifndef PYTHON_PAKFIRE_SOLVABLE_H
+#define PYTHON_PAKFIRE_SOLVABLE_H
 
 #include <Python.h>
 
@@ -107,4 +107,4 @@ extern PyObject *Solvable_get_suggests(SolvableObject *self);
 
 extern PyTypeObject SolvableType;
 
-#endif
+#endif /* PYTHON_PAKFIRE_SOLVABLE_H */

diff --git a/src/_pakfire/solver.h b/src/_pakfire/solver.h
index 8a4478b2d6983f238add8e4034d39a736104f2fa..63003af5437e9cf1c9a085cb181536cedd1829a1 100644 (file)
--- a/src/_pakfire/solver.h
+++ b/src/_pakfire/solver.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_SOLVER_H
-#define PAKFIRE_SOLVER_H
+#ifndef PYTHON_PAKFIRE_SOLVER_H
+#define PYTHON_PAKFIRE_SOLVER_H
 
 #include <Python.h>
 
@@ -55,4 +55,4 @@ extern PyObject *Solver_get_problems(SolverObject *self, PyObject *args);
 
 extern PyTypeObject SolverType;
 
-#endif
+#endif /* PYTHON_PAKFIRE_SOLVER_H */

diff --git a/src/_pakfire/step.h b/src/_pakfire/step.h
index ab105755c4442da7587b48d95ea38d934908b526..eab1d6cfa5e0b89ff3957b8235435d6d9516b7dd 100644 (file)
--- a/src/_pakfire/step.h
+++ b/src/_pakfire/step.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_STEP_H
-#define PAKFIRE_STEP_H
+#ifndef PYTHON_PAKFIRE_STEP_H
+#define PYTHON_PAKFIRE_STEP_H
 
 #include <Python.h>
 
@@ -40,4 +40,4 @@ extern PyObject *Step_get_solvable(StepObject *self, PyObject *args);
 
 extern PyTypeObject StepType;
 
-#endif
+#endif /* PYTHON_PAKFIRE_STEP_H */

diff --git a/src/_pakfire/transaction.h b/src/_pakfire/transaction.h
index 1dfe28f2db1a59e527443f623c34161d945313cd..7c5c1cc8fad0d1c2daeb6cfd62692230432fa153 100644 (file)
--- a/src/_pakfire/transaction.h
+++ b/src/_pakfire/transaction.h
@@ -18,8 +18,8 @@
 #                                                                             #
 #############################################################################*/
 
-#ifndef PAKFIRE_TRANSACTION_H
-#define PAKFIRE_TRANSACTION_H
+#ifndef PYTHON_PAKFIRE_TRANSACTION_H
+#define PYTHON_PAKFIRE_TRANSACTION_H
 
 #include <Python.h>
 
@@ -39,4 +39,4 @@ extern PyObject *Transaction_get_installsizechange(TransactionObject *self);
 
 extern PyTypeObject TransactionType;
 
-#endif
+#endif /* PYTHON_PAKFIRE_TRANSACTION_H */