Browse code

Header file conditional macros renamed (DB_ -> DB1).

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.

Jan Janak authored on 12/02/2009 19:28:11
Showing 12 changed files
... ...
@@ -39,8 +39,8 @@
39 39
  * take a look at the sources of the usrloc or auth modules.
40 40
  */
41 41
 
42
-#ifndef DB_H
43
-#define DB_H
42
+#ifndef DB1_H
43
+#define DB1_H
44 44
 
45 45
 #include "db_key.h"
46 46
 #include "db_op.h"
... ...
@@ -399,4 +399,4 @@ int db_use_table(db1_con_t* _h, const str* _t);
399 399
 typedef int (*db_bind_api_f)(db_func_t *dbb);
400 400
 
401 401
 
402
-#endif /* DB_H */
402
+#endif /* DB1_H */
... ...
@@ -31,8 +31,8 @@
31 31
  * values.
32 32
  */
33 33
 
34
-#ifndef DB_CAP_H
35
-#define DB_CAP_H
34
+#ifndef DB1_CAP_H
35
+#define DB1_CAP_H
36 36
 
37 37
 
38 38
 /*! \brief
... ...
@@ -66,4 +66,4 @@ typedef enum db_cap {
66 66
 #define DB_CAPABILITY(dbf, cpv) (((dbf).cap & (cpv)) == (cpv))
67 67
 
68 68
 
69
-#endif /* DB_CAP_H */
69
+#endif /* DB1_CAP_H */
... ...
@@ -27,8 +27,8 @@
27 27
  * \brief Type that represents a database connection
28 28
  */
29 29
 
30
-#ifndef DB_CON_H
31
-#define DB_CON_H
30
+#ifndef DB1_CON_H
31
+#define DB1_CON_H
32 32
 
33 33
 #include "../../str.h"
34 34
 
... ...
@@ -49,4 +49,4 @@ typedef struct {
49 49
 #define CON_TAIL(cn)       ((cn)->tail)
50 50
 
51 51
 
52
-#endif /* DB_CON_H */
52
+#endif /* DB1_CON_H */
... ...
@@ -27,8 +27,8 @@
27 27
  * \brief Functions for parsing a database URL and works with db identifier.
28 28
  */
29 29
 
30
-#ifndef _DB_ID_H
31
-#define _DB_ID_H
30
+#ifndef _DB1_ID_H
31
+#define _DB1_ID_H
32 32
 
33 33
 #include "../../str.h"
34 34
 
... ...
@@ -67,4 +67,4 @@ unsigned char cmp_db_id(const struct db_id* id1, const struct db_id* id2);
67 67
 void free_db_id(struct db_id* id);
68 68
 
69 69
 
70
-#endif /* _DB_ID_H */
70
+#endif /* _DB1_ID_H */
... ...
@@ -27,8 +27,8 @@
27 27
  * \brief Type that represents a database key.
28 28
  */
29 29
 
30
-#ifndef DB_KEY_H
31
-#define DB_KEY_H
30
+#ifndef DB1_KEY_H
31
+#define DB1_KEY_H
32 32
 
33 33
 #include "../../ut.h"
34 34
 
... ...
@@ -40,4 +40,4 @@
40 40
 typedef str* db_key_t;
41 41
 
42 42
 
43
-#endif /* DB_KEY_H */
43
+#endif /* DB1_KEY_H */
... ...
@@ -27,8 +27,8 @@
27 27
  * \ingroup db1
28 28
  */
29 29
 
30
-#ifndef DB_OP_H
31
-#define DB_OP_H
30
+#ifndef DB1_OP_H
31
+#define DB1_OP_H
32 32
 
33 33
 /** operator less than */
34 34
 #define OP_LT  "<"
... ...
@@ -50,4 +50,4 @@
50 50
 typedef const char* db_op_t;
51 51
 
52 52
 
53
-#endif /* DB_OP_H */
53
+#endif /* DB1_OP_H */
... ...
@@ -27,8 +27,8 @@
27 27
  * \ingroup db1
28 28
  */
29 29
 
30
-#ifndef _DB_POOL_H
31
-#define _DB_POOL_H
30
+#ifndef _DB1_POOL_H
31
+#define _DB1_POOL_H
32 32
 
33 33
 #include "db_id.h"
34 34
 #include "db_con.h"
... ...
@@ -80,4 +80,4 @@ void pool_insert(struct pool_con* con);
80 80
 int pool_remove(struct pool_con* con);
81 81
 
82 82
 
83
-#endif /* _POOL_H */
83
+#endif /* _DB1_POOL_H */
... ...
@@ -32,8 +32,8 @@
32 32
  * implementation.
33 33
 */
34 34
 
35
-#ifndef DB_QUERY_H
36
-#define DB_QUERY_H
35
+#ifndef DB1_QUERY_H
36
+#define DB1_QUERY_H
37 37
 
38 38
 #include "db_key.h"
39 39
 #include "db_op.h"
... ...
@@ -31,8 +31,8 @@
31 31
  * \ingroup db1
32 32
  */
33 33
 
34
-#ifndef DB_RES_H
35
-#define DB_RES_H
34
+#ifndef DB1_RES_H
35
+#define DB1_RES_H
36 36
 
37 37
 
38 38
 #include "db_key.h"
... ...
@@ -128,4 +128,4 @@ inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols);
128 128
  */
129 129
 inline int db_allocate_rows(db1_res_t* _res);
130 130
 
131
-#endif /* DB_RES_H */
131
+#endif /* DB1_RES_H */
... ...
@@ -31,8 +31,8 @@
31 31
  */
32 32
 
33 33
 
34
-#ifndef DB_ROW_H
35
-#define DB_ROW_H
34
+#ifndef DB1_ROW_H
35
+#define DB1_ROW_H
36 36
 
37 37
 #include "db_val.h"
38 38
 #include "db_res.h"
... ...
@@ -73,4 +73,4 @@ inline int db_free_row(db_row_t* _r);
73 73
  */
74 74
 inline int db_allocate_row(const db1_res_t* _res, db_row_t* _row);
75 75
 
76
-#endif /* DB_ROW_H */
76
+#endif /* DB1_ROW_H */
... ...
@@ -30,8 +30,8 @@
30 30
  * \ingroup db1
31 31
 */
32 32
 
33
-#ifndef DB_UT_H
34
-#define DB_UT_H
33
+#ifndef DB1_UT_H
34
+#define DB1_UT_H
35 35
 
36 36
 /**
37 37
  * maximal SQL buffer length for database drivers
... ...
@@ -34,8 +34,8 @@
34 34
  */
35 35
 
36 36
 
37
-#ifndef DB_VAL_H
38
-#define DB_VAL_H
37
+#ifndef DB1_VAL_H
38
+#define DB1_VAL_H
39 39
 
40 40
 #include "db_con.h"
41 41
 #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,
195 195
  */
196 196
 int db_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _len);
197 197
 
198
-#endif /* DB_VAL_H */
198
+#endif /* DB1_VAL_H */