libpreludedb/master: preludedb: fix some compile errors with g++

commit 425c4dc86168e8bf8c2c47cac2e05e78baf8e77c
Author: Hauke Mehrtens <[email protected]>
Date:   Fri Jun 18 13:45:50 2010 +0200

    preludedb: fix some compile errors with g++
    
    Signed-off-by: Hauke Mehrtens <[email protected]>


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

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

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

diff --git a/src/include/preludedb-error.h b/src/include/preludedb-error.h
index ab9b1a4..a345fd8 100644
--- a/src/include/preludedb-error.h
+++ b/src/include/preludedb-error.h
@@ -61,7 +61,7 @@ typedef prelude_error_t preludedb_error_t;
 
 static inline preludedb_error_t preludedb_error(preludedb_error_code_t error)
 {
-        return (preludedb_error_t) prelude_error_make(PRELUDE_ERROR_SOURCE_PRELUDEDB, error);
+        return (preludedb_error_t) prelude_error_make(PRELUDE_ERROR_SOURCE_PRELUDEDB, (prelude_error_code_t) error);
 }
 
 
@@ -72,7 +72,7 @@ static inline preludedb_error_t preludedb_error_verbose(preludedb_error_code_t e
 	va_list ap;
 
 	va_start(ap, fmt);
-	ret = prelude_error_verbose_make_v(PRELUDE_ERROR_SOURCE_PRELUDEDB, error, fmt, ap);
+	ret = prelude_error_verbose_make_v(PRELUDE_ERROR_SOURCE_PRELUDEDB, (prelude_error_code_t) error, fmt, ap);
 	va_end(ap);
 
 	return ret;
diff --git a/src/include/preludedb-sql.h b/src/include/preludedb-sql.h
index c939a0e..b1a93f3 100644
--- a/src/include/preludedb-sql.h
+++ b/src/include/preludedb-sql.h
@@ -63,7 +63,7 @@ typedef struct preludedb_sql_table preludedb_sql_table_t;
 typedef struct preludedb_sql_row preludedb_sql_row_t;
 typedef struct preludedb_sql_field preludedb_sql_field_t;
 
-int preludedb_sql_new(preludedb_sql_t **new, const char *type, preludedb_sql_settings_t *settings);
+int preludedb_sql_new(preludedb_sql_t **newdb, const char *type, preludedb_sql_settings_t *settings);
 
 void preludedb_sql_destroy(preludedb_sql_t *sql);
 
@@ -117,7 +117,7 @@ int preludedb_sql_field_to_string(preludedb_sql_field_t *field, prelude_string_t
 int preludedb_sql_build_criterion_string(preludedb_sql_t *sql,
 					 prelude_string_t *output,
 					 const char *field,
-					 idmef_criterion_operator_t operator, idmef_criterion_value_t *value);
+					 idmef_criterion_operator_t idmef_operator, idmef_criterion_value_t *value);
 
 int preludedb_sql_time_from_timestamp(idmef_time_t *time, const char *time_buf, int32_t gmtoff, uint32_t usec);
 int preludedb_sql_time_to_timestamp(preludedb_sql_t *sql,
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-technologies.com/mailman/listinfo/prelude-cvslog