i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build of the app_server test environment on Haiku.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36147 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-04-11 13:15:54 +00:00
parent 8cf2d646ba
commit af6693471d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/HaikuBuildCompatibility.h
+14 -5
View File
@@ -31,12 +31,14 @@
#include <string.h> #include <string.h>
// no addr_t under standard BeOS // no addr_t under standard BeOS
#ifndef HAIKU_HOST_PLATFORM_HAIKU #if !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) \
&& !defined(HAIKU_HOST_PLATFORM_HAIKU)
typedef unsigned long haiku_build_addr_t; typedef unsigned long haiku_build_addr_t;
# define addr_t haiku_build_addr_t # define addr_t haiku_build_addr_t
#endif #endif
#ifndef HAIKU_HOST_PLATFORM_HAIKU #if !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) \
&& !defined(HAIKU_HOST_PLATFORM_HAIKU)
struct sockaddr_storage { struct sockaddr_storage {
uint8 ss_len; /* total length */ uint8 ss_len; /* total length */
@@ -79,6 +81,9 @@ typedef int socklen_t;
__attribute__((format(__printf__, _format_, _args_))) __attribute__((format(__printf__, _format_, _args_)))
#endif #endif
#if 0
// NOTE: This is probably only needed on platforms which don't use ELF
// as binary format. So could probably be removed completely.
#if defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) \ #if defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) \
&& !defined(HAIKU_HOST_PLATFORM_HAIKU) && !defined(HAIKU_HOST_PLATFORM_HAIKU)
// BeOS version of BeBuild.h defines this // BeOS version of BeBuild.h defines this
@@ -90,6 +95,7 @@ typedef int socklen_t;
# define _IMPEXP_DEVICE __declspec(dllimport) # define _IMPEXP_DEVICE __declspec(dllimport)
# define _IMPEXP_NET __declspec(dllimport) # define _IMPEXP_NET __declspec(dllimport)
#endif #endif
#endif
#if defined(__cplusplus) && !defined(HAIKU_HOST_PLATFORM_HAIKU) #if defined(__cplusplus) && !defined(HAIKU_HOST_PLATFORM_HAIKU)
class BBuffer; class BBuffer;
@@ -161,7 +167,8 @@ extern float roundf(float value);
# define B_DOCUMENT_TEXT_COLOR B_MENU_ITEM_TEXT_COLOR # define B_DOCUMENT_TEXT_COLOR B_MENU_ITEM_TEXT_COLOR
#endif #endif
#if !defined(HAIKU_HOST_PLATFORM_HAIKU) && !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) #if !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) \
&& !defined(HAIKU_HOST_PLATFORM_HAIKU)
# if !defined(B_NOT_SUPPORTED) && !defined(HAIKU_HOST_PLATFORM_DANO) # if !defined(B_NOT_SUPPORTED) && !defined(HAIKU_HOST_PLATFORM_DANO)
# define B_NOT_SUPPORTED (B_ERROR) # define B_NOT_SUPPORTED (B_ERROR)
# endif # endif
@@ -185,7 +192,8 @@ extern float roundf(float value);
# define INT64_MAX LONGLONG_MAX # define INT64_MAX LONGLONG_MAX
#endif #endif
#ifndef HAIKU_HOST_PLATFORM_HAIKU #if !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) \
&& !defined(HAIKU_HOST_PLATFORM_HAIKU)
# define B_MPEG_2_AUDIO_LAYER_1 (enum mpeg_id)0x201 # define B_MPEG_2_AUDIO_LAYER_1 (enum mpeg_id)0x201
# define B_MPEG_2_AUDIO_LAYER_2 (enum mpeg_id)0x202 # define B_MPEG_2_AUDIO_LAYER_2 (enum mpeg_id)0x202
# define B_MPEG_2_AUDIO_LAYER_3 (enum mpeg_id)0x203 # define B_MPEG_2_AUDIO_LAYER_3 (enum mpeg_id)0x203
@@ -196,7 +204,8 @@ extern float roundf(float value);
#endif #endif
// TODO: experimental API (keep in sync with Accelerant.h) // TODO: experimental API (keep in sync with Accelerant.h)
#ifndef HAIKU_HOST_PLATFORM_HAIKU #if !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) \
&& !defined(HAIKU_HOST_PLATFORM_HAIKU)
typedef struct { typedef struct {
uint32 version; uint32 version;
char vendor[128]; char vendor[128];