[Pdatabase-cvs] pdb/include pdb.h,1.10,1.11 pdb_types.h,1.7,1.8 str.h,1.4,1.5

[Michael L. <par...@us...>]

Update of /cvsroot/pdatabase/pdb/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11142/include

Modified Files:
	pdb.h pdb_types.h str.h 
Log Message:
Added some win32 porting updates by CyberMind

Index: pdb.h
===================================================================
RCS file: /cvsroot/pdatabase/pdb/include/pdb.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pdb.h	10 Feb 2005 02:51:06 -0000	1.10
+++ pdb.h	24 Feb 2005 16:48:38 -0000	1.11
@@ -25,6 +25,17 @@
 /*
  *	Handy macros.
  */
+#ifdef WIN32
+	#define __FUNCTION__ "FuncNA"
+#endif
+
+/*
+ *	Comment this if you do not wish to compile
+ *	pdb as a library (shared object).
+ */
+#define PDB_COMPILE_AS_LIB
+
+
 #define ERROR(msg)	fprintf(stderr, "Error: %s:%s():%i: %s\n", __FILE__, \
 					__FUNCTION__, __LINE__, msg);
 #define WARNING(msg)	fprintf(stderr, "Warning: %s:%s():%i: %s\n", __FILE__, \
@@ -173,35 +184,42 @@
 {
 #endif
 
-struct pdb* pdb_load(char* file);
-int pdb_unload(struct pdb* dbptr);
+#if defined(WIN32) && defined(PDB_COMPILE_AS_LIB)
+	#define DLLEXP __declspec(dllexport)
+#endif
+#ifndef DLLEXP
+	#define DLLEXP
+#endif
 
-void pdb_enable(struct pdb* dbptr, int settings);
-void pdb_disable(struct pdb* dbptr, int settings);
-int pdb_is_set(struct pdb* dbptr, int setting);
+DLLEXP struct pdb* pdb_load(char* file);
+DLLEXP int pdb_unload(struct pdb* dbptr);
 
-int pdb_create_link(struct pdb* dbptr, char* path, char* key,
+DLLEXP void pdb_enable(struct pdb* dbptr, int settings);
+DLLEXP void pdb_disable(struct pdb* dbptr, int settings);
+DLLEXP int pdb_is_set(struct pdb* dbptr, int setting);
+
+DLLEXP int pdb_create_link(struct pdb* dbptr, char* path, char* key,
 	struct pdb_node_t* tnptr);
 
-struct pdb_node_t* pdb_query_node(struct pdb* dbptr, char* path);
-void* pdb_query(struct pdb* dbptr, char* path);
+DLLEXP struct pdb_node_t* pdb_query_node(struct pdb* dbptr, char* path);
+DLLEXP void* pdb_query(struct pdb* dbptr, char* path);
 
-struct pdb_node_t* pdb_set(struct pdb* dbptr, char* path, char* key,
+DLLEXP struct pdb_node_t* pdb_set(struct pdb* dbptr, char* path, char* key,
 	void* data);
-struct pdb_node_t* pdb_set_node(struct pdb* dbptr, char* path, char* key,
+DLLEXP struct pdb_node_t* pdb_set_node(struct pdb* dbptr, char* path, char* key,
 	void* data, int type);
-int pdb_del(struct pdb* dbptr, char* path);
+DLLEXP int pdb_del(struct pdb* dbptr, char* path);
 
-char* pdb_trace(struct pdb_node_t* nptr);
+DLLEXP char* pdb_trace(struct pdb_node_t* nptr);
 
-void pdb_set_write_interval(struct pdb* dbptr, int seconds);
-int pdb_need_write(struct pdb* dbptr);
-int pdb_write(struct pdb* dbptr, char* file);
+DLLEXP void pdb_set_write_interval(struct pdb* dbptr, int seconds);
+DLLEXP int pdb_need_write(struct pdb* dbptr);
+DLLEXP int pdb_write(struct pdb* dbptr, char* file);
 
-void pdb_set_free_method(struct pdb* dbptr, struct pdb_node_t* nptr,
+DLLEXP void pdb_set_free_method(struct pdb* dbptr, struct pdb_node_t* nptr,
 	void* free_cb);
 
-int pdb_count_children(struct pdb* dbptr, char* path);
+DLLEXP int pdb_count_children(struct pdb* dbptr, char* path);
 
 #ifdef __cplusplus
 }

Index: pdb_types.h
===================================================================
RCS file: /cvsroot/pdatabase/pdb/include/pdb_types.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pdb_types.h	25 Jan 2005 02:29:41 -0000	1.7
+++ pdb_types.h	24 Feb 2005 16:48:38 -0000	1.8
@@ -104,13 +104,19 @@
 {
 #endif
 
-struct pdb_node_t* pdb_create_tree(struct pdb* dbptr, char* path, char* key);
-struct pdb_node_t* pdb_create_list(struct pdb* dbptr, char* path, char* key);
-struct pdb_node_t* pdb_create_hash(struct pdb* dbptr, char* path, char* key,
+#ifdef WIN32
+ #define DLLEXP __declspec(dllexport)
+#else
+ #define DLLEXP
+#endif
+
+DLLEXP struct pdb_node_t* pdb_create_tree(struct pdb* dbptr, char* path, char* key);
+DLLEXP struct pdb_node_t* pdb_create_list(struct pdb* dbptr, char* path, char* key);
+DLLEXP struct pdb_node_t* pdb_create_hash(struct pdb* dbptr, char* path, char* key,
 	int size);
-struct pdb_node_t* pdb_create_abstract(struct pdb* dbptr, char* path,
+DLLEXP struct pdb_node_t* pdb_create_abstract(struct pdb* dbptr, char* path,
 	char* key, void* data, void* free_cb);
-struct pdb_node_t* pdb_set_int(struct pdb* dbptr, char* path,
+DLLEXP struct pdb_node_t* pdb_set_int(struct pdb* dbptr, char* path,
 	char* key, int data);
 
 struct pdb_node_types_t* pdb_get_type_info(int type);
@@ -119,7 +125,7 @@
 
 int pdb_standard_load_node(FILE* fptr, struct pdb_node_t* pptr,
 	char** tok_arr, int* line);
-int pdb_free_node(struct pdb_node_t* nptr);
+DLLEXP int pdb_free_node(struct pdb_node_t* nptr);
 int pdb_standard_write_node(struct pdb* dbptr, FILE* fptr,
 	struct pdb_node_t* nptr, int tabs);
 

Index: str.h
===================================================================
RCS file: /cvsroot/pdatabase/pdb/include/str.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- str.h	25 Jan 2005 02:29:41 -0000	1.4
+++ str.h	24 Feb 2005 16:48:38 -0000	1.5
@@ -25,6 +25,10 @@
 
 #define int_to_char(x)	((char)(x + 48))
 
+#ifdef WIN32
+#define vsnprintf _vsnprintf
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -69,8 +73,6 @@
 
 int str_starts_with(char* str, char* tok);
 
-char* itoa(int i);
-
 #ifdef __cplusplus
 }
 #endif