[PATCH] Header file conditional macros renamed (DB_ -> DB1).
Jan Janak
jan at iptel.org
Thu Feb 12 20:28:11 CET 2009
All macros protecting header files against multiple inclusions have been
renamed to make sure that there are no conflicts with header fields from srdb2
library.
---
lib/srdb1/db.h | 6 +++---
lib/srdb1/db_cap.h | 6 +++---
lib/srdb1/db_con.h | 6 +++---
lib/srdb1/db_id.h | 6 +++---
lib/srdb1/db_key.h | 6 +++---
lib/srdb1/db_op.h | 6 +++---
lib/srdb1/db_pool.h | 6 +++---
lib/srdb1/db_query.h | 4 ++--
lib/srdb1/db_res.h | 6 +++---
lib/srdb1/db_row.h | 6 +++---
lib/srdb1/db_ut.h | 4 ++--
lib/srdb1/db_val.h | 6 +++---
12 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h
index 6c088c4..0429e2c 100644
--- a/lib/srdb1/db.h
+++ b/lib/srdb1/db.h
@@ -39,8 +39,8 @@
* take a look at the sources of the usrloc or auth modules.
*/
-#ifndef DB_H
-#define DB_H
+#ifndef DB1_H
+#define DB1_H
#include "db_key.h"
#include "db_op.h"
@@ -399,4 +399,4 @@ int db_use_table(db1_con_t* _h, const str* _t);
typedef int (*db_bind_api_f)(db_func_t *dbb);
-#endif /* DB_H */
+#endif /* DB1_H */
diff --git a/lib/srdb1/db_cap.h b/lib/srdb1/db_cap.h
index 11160ca..e87ef66 100644
--- a/lib/srdb1/db_cap.h
+++ b/lib/srdb1/db_cap.h
@@ -31,8 +31,8 @@
* values.
*/
-#ifndef DB_CAP_H
-#define DB_CAP_H
+#ifndef DB1_CAP_H
+#define DB1_CAP_H
/*! \brief
@@ -66,4 +66,4 @@ typedef enum db_cap {
#define DB_CAPABILITY(dbf, cpv) (((dbf).cap & (cpv)) == (cpv))
-#endif /* DB_CAP_H */
+#endif /* DB1_CAP_H */
diff --git a/lib/srdb1/db_con.h b/lib/srdb1/db_con.h
index 0765eee..3660d29 100644
--- a/lib/srdb1/db_con.h
+++ b/lib/srdb1/db_con.h
@@ -27,8 +27,8 @@
* \brief Type that represents a database connection
*/
-#ifndef DB_CON_H
-#define DB_CON_H
+#ifndef DB1_CON_H
+#define DB1_CON_H
#include "../../str.h"
@@ -49,4 +49,4 @@ typedef struct {
#define CON_TAIL(cn) ((cn)->tail)
-#endif /* DB_CON_H */
+#endif /* DB1_CON_H */
diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h
index 018f7df..025855f 100644
--- a/lib/srdb1/db_id.h
+++ b/lib/srdb1/db_id.h
@@ -27,8 +27,8 @@
* \brief Functions for parsing a database URL and works with db identifier.
*/
-#ifndef _DB_ID_H
-#define _DB_ID_H
+#ifndef _DB1_ID_H
+#define _DB1_ID_H
#include "../../str.h"
@@ -67,4 +67,4 @@ unsigned char cmp_db_id(const struct db_id* id1, const struct db_id* id2);
void free_db_id(struct db_id* id);
-#endif /* _DB_ID_H */
+#endif /* _DB1_ID_H */
diff --git a/lib/srdb1/db_key.h b/lib/srdb1/db_key.h
index 40df120..c55a812 100644
--- a/lib/srdb1/db_key.h
+++ b/lib/srdb1/db_key.h
@@ -27,8 +27,8 @@
* \brief Type that represents a database key.
*/
-#ifndef DB_KEY_H
-#define DB_KEY_H
+#ifndef DB1_KEY_H
+#define DB1_KEY_H
#include "../../ut.h"
@@ -40,4 +40,4 @@
typedef str* db_key_t;
-#endif /* DB_KEY_H */
+#endif /* DB1_KEY_H */
diff --git a/lib/srdb1/db_op.h b/lib/srdb1/db_op.h
index 0b5eb4f..10ee44a 100644
--- a/lib/srdb1/db_op.h
+++ b/lib/srdb1/db_op.h
@@ -27,8 +27,8 @@
* \ingroup db1
*/
-#ifndef DB_OP_H
-#define DB_OP_H
+#ifndef DB1_OP_H
+#define DB1_OP_H
/** operator less than */
#define OP_LT "<"
@@ -50,4 +50,4 @@
typedef const char* db_op_t;
-#endif /* DB_OP_H */
+#endif /* DB1_OP_H */
diff --git a/lib/srdb1/db_pool.h b/lib/srdb1/db_pool.h
index c569a1e..d0a3982 100644
--- a/lib/srdb1/db_pool.h
+++ b/lib/srdb1/db_pool.h
@@ -27,8 +27,8 @@
* \ingroup db1
*/
-#ifndef _DB_POOL_H
-#define _DB_POOL_H
+#ifndef _DB1_POOL_H
+#define _DB1_POOL_H
#include "db_id.h"
#include "db_con.h"
@@ -80,4 +80,4 @@ void pool_insert(struct pool_con* con);
int pool_remove(struct pool_con* con);
-#endif /* _POOL_H */
+#endif /* _DB1_POOL_H */
diff --git a/lib/srdb1/db_query.h b/lib/srdb1/db_query.h
index 0dd83b2..41e0fd8 100644
--- a/lib/srdb1/db_query.h
+++ b/lib/srdb1/db_query.h
@@ -32,8 +32,8 @@
* implementation.
*/
-#ifndef DB_QUERY_H
-#define DB_QUERY_H
+#ifndef DB1_QUERY_H
+#define DB1_QUERY_H
#include "db_key.h"
#include "db_op.h"
diff --git a/lib/srdb1/db_res.h b/lib/srdb1/db_res.h
index 608026b..82734b3 100644
--- a/lib/srdb1/db_res.h
+++ b/lib/srdb1/db_res.h
@@ -31,8 +31,8 @@
* \ingroup db1
*/
-#ifndef DB_RES_H
-#define DB_RES_H
+#ifndef DB1_RES_H
+#define DB1_RES_H
#include "db_key.h"
@@ -128,4 +128,4 @@ inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols);
*/
inline int db_allocate_rows(db1_res_t* _res);
-#endif /* DB_RES_H */
+#endif /* DB1_RES_H */
diff --git a/lib/srdb1/db_row.h b/lib/srdb1/db_row.h
index c411775..855ed3d 100644
--- a/lib/srdb1/db_row.h
+++ b/lib/srdb1/db_row.h
@@ -31,8 +31,8 @@
*/
-#ifndef DB_ROW_H
-#define DB_ROW_H
+#ifndef DB1_ROW_H
+#define DB1_ROW_H
#include "db_val.h"
#include "db_res.h"
@@ -73,4 +73,4 @@ inline int db_free_row(db_row_t* _r);
*/
inline int db_allocate_row(const db1_res_t* _res, db_row_t* _row);
-#endif /* DB_ROW_H */
+#endif /* DB1_ROW_H */
diff --git a/lib/srdb1/db_ut.h b/lib/srdb1/db_ut.h
index 3ca6bbe..050a75b 100644
--- a/lib/srdb1/db_ut.h
+++ b/lib/srdb1/db_ut.h
@@ -30,8 +30,8 @@
* \ingroup db1
*/
-#ifndef DB_UT_H
-#define DB_UT_H
+#ifndef DB1_UT_H
+#define DB1_UT_H
/**
* maximal SQL buffer length for database drivers
diff --git a/lib/srdb1/db_val.h b/lib/srdb1/db_val.h
index a523033..2e5b166 100644
--- a/lib/srdb1/db_val.h
+++ b/lib/srdb1/db_val.h
@@ -34,8 +34,8 @@
*/
-#ifndef DB_VAL_H
-#define DB_VAL_H
+#ifndef DB1_VAL_H
+#define DB1_VAL_H
#include "db_con.h"
#include <time.h>
@@ -195,4 +195,4 @@ int db_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l,
*/
int db_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _len);
-#endif /* DB_VAL_H */
+#endif /* DB1_VAL_H */
--
1.5.6.5
--7ZAtKRhVyVSsbBD2--
More information about the sr-dev
mailing list