libpreludedb/master: C++ compilation fixes

[email protected] Tue, 22 Jun 2010 12:20:02 +0200 (CEST)
Newsgroups gmane.comp.security.ids.prelude.cvs
Message-ID <[email protected]>
commit 1109068059501f5e7d5fbbae6bdcc1903117813e
Author: Yoann Vandoorselaere <[email protected]>
Date:   Tue Jun 22 12:19:52 2010 +0200

    C++ compilation fixes
    
    Include required dependencies, and add missing cast to preludedb-error.h


========================================

 src/include/preludedb-error.h |    4 ++--
 src/include/preludedb-sql.h   |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

========================================

diff --git a/src/include/preludedb-error.h b/src/include/preludedb-error.h
index a345fd8..0afa9b3 100644
--- a/src/include/preludedb-error.h
+++ b/src/include/preludedb-error.h
@@ -83,8 +83,8 @@ static inline preludedb_error_t preludedb_error_verbose(preludedb_error_code_t e
 static inline prelude_bool_t preludedb_error_check(preludedb_error_t error,
 						   preludedb_error_code_t code)
 {
-	return (prelude_error_get_source(error) == PRELUDE_ERROR_SOURCE_PRELUDEDB &&
-		prelude_error_get_code(error) == code);
+	return (prelude_bool_t) (prelude_error_get_source(error) == PRELUDE_ERROR_SOURCE_PRELUDEDB &&
+		                 prelude_error_get_code(error) == (prelude_error_code_t) code);
 }
 
 
diff --git a/src/include/preludedb-sql.h b/src/include/preludedb-sql.h
index b1a93f3..c545655 100644
--- a/src/include/preludedb-sql.h
+++ b/src/include/preludedb-sql.h
@@ -25,6 +25,9 @@
 #define _LIBPRELUDEDB_SQL_H
 
 #include <libprelude/prelude-string.h>
+#include <libprelude/idmef-criteria.h>
+#include <libprelude/idmef-time.h>
+#include "preludedb-sql-settings.h"
 
 #ifdef __cplusplus
  extern "C" {
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-technologies.com/mailman/listinfo/prelude-cvslog