Fix build on 64-bit Haiku

- Fix path to look for libnetwork to work also on non-hybrid systems
- Remove references to /boot/common as it is not used anymore
- Fix a few type errors
- Use compiler provided va_copy when available
This commit is contained in:
Adrien Destugues 2015-07-13 19:45:02 +02:00 committed by Vincent Sanders
parent f24b4b94bc
commit 989bc6e190
4 changed files with 4 additions and 12 deletions

View File

@ -40,16 +40,8 @@ ifeq ($(HOST),beos)
ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),)
LDFLAGS += -lzeta
endif
ifneq ($(wildcard /boot/system/develop/lib/*/libnetwork.so),)
ifneq ($(wildcard /boot/system/develop/lib/libnetwork.so),)
# Haiku
CFLAGS += -I/boot/common/include \
-I/boot/common/include/hubbub \
-I/boot/common/include/libcss \
-I/boot/common/include/parserutils
CXXFLAGS += -I/boot/common/include \
-I/boot/common/include/hubbub \
-I/boot/common/include/libcss \
-I/boot/common/include/parserutils
NETLDFLAGS := -lnetwork
else
ifneq ($(wildcard /boot/develop/lib/*/libbind.so),)

View File

@ -72,7 +72,7 @@ void beos_fetch_filetype_init(void)
continue;
}
// the mime db doesn't know about it yet
BMessage extensions(0UL);
BMessage extensions('exts');
if (default_types[i].ext1)
extensions.AddString("extensions", default_types[i].ext1);
if (default_types[i].ext2)

View File

@ -1275,7 +1275,7 @@ void gui_get_clipboard(char **buffer, size_t *length)
clip = be_clipboard->Data();
if (clip) {
const char *text;
int32 textlen;
ssize_t textlen;
if (clip->FindData("text/plain", B_MIME_TYPE,
(const void **)&text, &textlen) >= B_OK) {
*buffer = (char *)malloc(textlen);

View File

@ -55,7 +55,7 @@
#include "replace.h"
#else
#include <stdarg.h>
#if !defined(__BEOS__) && !defined(__HAIKU__) && __GNUC__ > 2
#if !defined(__BEOS__) && __GNUC__ > 2
/* Assume we've got va_copy */
#define HAVE_VA_COPY
#include <string.h>