mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 12:12:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on 64-bit Haiku

Browse Source 
- 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
beos/Makefile.target
View File

@ -40,16 +40,8 @@ ifeq ($(HOST),beos)
ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),) ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),)
LDFLAGS += -lzeta LDFLAGS += -lzeta
endif endif
ifneq ($(wildcard /boot/system/develop/lib/*/libnetwork.so),) ifneq ($(wildcard /boot/system/develop/lib/libnetwork.so),)
# Haiku # 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 NETLDFLAGS := -lnetwork
else else
ifneq ($(wildcard /boot/develop/lib/*/libbind.so),) ifneq ($(wildcard /boot/develop/lib/*/libbind.so),)

2
beos/filetype.cpp
View File

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

2
beos/window.cpp
View File

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

2
utils/talloc.c
View File

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