diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-14 23:36:30 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-14 23:36:30 +0000 |
| commit | 70cedacdde512d2ed5984eec242c55f3239b73fc (patch) | |
| tree | 48694f38698e4ead3840305333816193c7fcd8a0 /db1-ast | |
| parent | c60f8a2b8e1551244e674baff85cb1a4f2d5fd5b (diff) | |
Merge slimey's Solaris compatibility (with small mods) (bug #2740)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4446 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'db1-ast')
| -rwxr-xr-x | db1-ast/Makefile | 5 | ||||
| -rwxr-xr-x | db1-ast/include/db.h | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/db1-ast/Makefile b/db1-ast/Makefile index f8192f795..0aa9fdb02 100755 --- a/db1-ast/Makefile +++ b/db1-ast/Makefile @@ -48,6 +48,11 @@ clean: OORG= -O2 CL= $(CC) -Wall -c -D__DBINTERFACE_PRIVATE $(OORG) -I. -Iinclude +OSTYPE=$(shell uname -s) +ifeq ($(OSTYPE),SunOS) +CL+=-I../include -I../include/solaris-compat -DSOLARIS +endif + db_dump185.o: db_dump185.c $(CL) -o $@ $< %.o: hash/%.c diff --git a/db1-ast/include/db.h b/db1-ast/include/db.h index d1258d2a6..a58724bdd 100755 --- a/db1-ast/include/db.h +++ b/db1-ast/include/db.h @@ -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 @@ typedef unsigned long long u_int64_t; #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 */ |