diff options
| author | Adrien Destugues <pulkomandy@gmail.com> | 2015-07-13 19:45:02 +0200 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-07-14 09:12:44 +0100 |
| commit | 989bc6e190ac37f60c273dafa8556741b28618b0 (patch) | |
| tree | 4f986fedd7caac8c364e6ab1506c583eebe36fcc | |
| parent | f24b4b94bc3aaf9eb725025a9104a8a0eaee6466 (diff) | |
| download | netsurf-989bc6e190ac37f60c273dafa8556741b28618b0.tar.gz netsurf-989bc6e190ac37f60c273dafa8556741b28618b0.tar.bz2 | |
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
| -rw-r--r-- | beos/Makefile.target | 10 | ||||
| -rw-r--r-- | beos/filetype.cpp | 2 | ||||
| -rw-r--r-- | beos/window.cpp | 2 | ||||
| -rw-r--r-- | utils/talloc.c | 2 |
4 files changed, 4 insertions, 12 deletions
diff --git a/beos/Makefile.target b/beos/Makefile.target index 0c8838555..23d8ccb12 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -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),) diff --git a/beos/filetype.cpp b/beos/filetype.cpp index d5bd3d77b..5a541543c 100644 --- a/beos/filetype.cpp +++ b/beos/filetype.cpp @@ -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) diff --git a/beos/window.cpp b/beos/window.cpp index 2763bc372..40b2eccdb 100644 --- a/beos/window.cpp +++ b/beos/window.cpp @@ -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); diff --git a/utils/talloc.c b/utils/talloc.c index 44b65aa3c..408e94b46 100644 --- a/utils/talloc.c +++ b/utils/talloc.c @@ -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> |