Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7506 - in /trunk/sat-solver/src: pool.h source_solv.h
  • From: matz@xxxxxxxxxxxxxxxx
  • Date: Fri, 12 Oct 2007 15:44:30 -0000
  • Message-id: <20071012154430.71E2C4551D@xxxxxxxxxxxxxxxx>
Author: matz
Date: Fri Oct 12 17:44:30 2007
New Revision: 7506

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7506&view=rev
Log:
Make the satsolver header usable with C++ (only pool.h and source_solv.h
for now, they drag in most of the usefull stuff anyway).

Modified:
    trunk/sat-solver/src/pool.h
    trunk/sat-solver/src/source_solv.h

Modified: trunk/sat-solver/src/pool.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=7506&r1=7505&r2=7506&view=diff
==============================================================================
--- trunk/sat-solver/src/pool.h (original)
+++ trunk/sat-solver/src/pool.h Fri Oct 12 17:44:30 2007
@@ -6,6 +6,10 @@
 #ifndef POOL_H
 #define POOL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "pooltypes.h"
 #include "poolid.h"
 #include "source.h"
@@ -13,7 +17,9 @@
 #include "queue.h"
 
 // bool
-typedef int bool;
+#ifndef __cplusplus
+typedef _Bool bool;
+#endif
 
 // see initpool_data[] in pool.c
 
@@ -131,4 +137,8 @@
 
 extern Source *pool_source(Pool *pool, Solvable *s);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* POOL_H */

Modified: trunk/sat-solver/src/source_solv.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/source_solv.h?rev=7506&r1=7505&r2=7506&view=diff
==============================================================================
--- trunk/sat-solver/src/source_solv.h (original)
+++ trunk/sat-solver/src/source_solv.h Fri Oct 12 17:44:30 2007
@@ -6,9 +6,17 @@
 #ifndef SOURCE_SOLVE_H
 #define SOURCE_SOLVE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "pool.h"
 #include "source.h"
 
 extern Source *pool_addsource_solv(Pool *pool, FILE *fp, const char *name);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SOURCE_SOLVE_H */

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages