[Asterisk-cvs] asterisk/db1-ast/include db.h,1.5,1.6

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/db1-ast/include
In directory mongoose.digium.com:/tmp/cvs-serv25047/db1-ast/include

Modified Files:
	db.h 
Log Message:
Merge slimey's Solaris compatibility (with small mods) (bug #2740)


Index: db.h
===================================================================
RCS file: /usr/cvsroot/asterisk/db1-ast/include/db.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db.h	31 Aug 2004 13:32:11 -0000	1.5
+++ db.h	14 Dec 2004 23:36:30 -0000	1.6
@@ -45,6 +45,10 @@
 #include <compat.h>
 #endif
 
+#ifdef SOLARIS
+#include "solaris-compat/compat.h"
+#endif
+
 #define	RET_ERROR	-1		/* Return values. */
 #define	RET_SUCCESS	 0
 #define	RET_SPECIAL	 1
@@ -53,10 +57,10 @@
 #define	__BIT_TYPES_DEFINED__
 #if (!defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__))
 typedef	__signed char		   int8_t;
-typedef	unsigned char		 u_int8_t;
 typedef	short			  int16_t;
-typedef	unsigned short		u_int16_t;
 typedef	int			  int32_t;
+typedef	unsigned char		 u_int8_t;
+typedef	unsigned short		u_int16_t;
 typedef	unsigned int		u_int32_t;
 #ifdef WE_DONT_NEED_QUADS
 typedef	long long		  int64_t;
@@ -65,6 +69,12 @@
 #endif /* __FreeBSD__ */
 #endif
 
+#ifdef SOLARIS
+#define	__P(p) p
+#define __BEGIN_DECLS
+#define __END_DECLS
+#endif
+
 #define	MAX_PAGE_NUMBER	0xffffffff	/* >= # of pages in a file */
 typedef u_int32_t	pgno_t;
 #define	MAX_PAGE_OFFSET	65535		/* >= # of bytes in a page */