mirror of
https://github.com/asterisk/asterisk.git
synced 2026-05-04 04:16:54 +00:00
Merge slimey's Solaris compatibility (with small mods) (bug #2740)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user