* Removed our stddef.h. We don't need it, since gcc comes with one that
under Haiku overrides ours anyway. * Adjusted size_t.h, wchar_t.h, wchar.h accordingly. This should fix the annoying "ssize_t redefined" warnings when compiling under Haiku. * When building Haiku the gcc headers come first in the include search path now, as it should be. The respective TODO suggested that this might break the build depending on compiler version and host platform. I've tested with Linux gcc 2 and gcc 4, which work fine. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24406 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+4
-10
@@ -365,8 +365,11 @@ rule FStandardHeaders
|
||||
kernel media mail midi midi2 net opengl storage support
|
||||
translation ;
|
||||
|
||||
# GCC headers
|
||||
local headers = $(HAIKU_GCC_HEADERS_DIR) ;
|
||||
|
||||
# Use headers directory, to allow to do things like include <posix/string.h>
|
||||
local headers = [ FDirName $(HAIKU_TOP) headers ] ;
|
||||
headers += [ FDirName $(HAIKU_TOP) headers ] ;
|
||||
|
||||
# Use posix headers directory
|
||||
headers += [ FDirName $(HAIKU_TOP) headers posix ] ;
|
||||
@@ -392,15 +395,6 @@ rule FStandardHeaders
|
||||
headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
|
||||
}
|
||||
|
||||
# The compiler dependent headers.
|
||||
# TODO: Actually these directory should be listed before the posix and cpp
|
||||
# directories, since the headers found here are supposed to override some of
|
||||
# the headers in the latter directories. Unfortunately some of our headers
|
||||
# are a bit messy (e.g. stddef.h) and using the compiler headers causes
|
||||
# trouble when using different compilers (gcc 2 vs. gcc 4) and different
|
||||
# host platforms (BeOS vs. Linux).
|
||||
headers += $(HAIKU_GCC_HEADERS_DIR) ;
|
||||
|
||||
return $(headers) ;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user