Ticket #8825: comparison--BeBuild-BeBuild.diff

os/BeBuild.h

@@ -6 +6 @@
 #define _BE_BUILD_H
 
 
-#include <config_build/HaikuConfig.h>
+#include <config/HaikuConfig.h>
 
 
 #define B_BEOS_VERSION_4                0x0400
@@ -22 +22 @@
 #define B_HAIKU_VERSION_DANO            0x00000003
 #define B_HAIKU_VERSION_1_ALPHA_1       0x00000100
 #define B_HAIKU_VERSION_1_PRE_ALPHA_2   0x00000101
+#define B_HAIKU_VERSION_1_ALPHA_2       0x00000200
+#define B_HAIKU_VERSION_1_PRE_ALPHA_3   0x00000201
+#define B_HAIKU_VERSION_1_ALPHA_3       0x00000300
+#define B_HAIKU_VERSION_1_PRE_BETA_1        0x00000301
 #define B_HAIKU_VERSION_1               0x00010000
 
-#define B_HAIKU_VERSION                 B_HAIKU_VERSION_1_PRE_ALPHA_2
+#define B_HAIKU_VERSION                 B_HAIKU_VERSION_1_PRE_BETA_1
 
 /* Haiku ABI */
 #define B_HAIKU_ABI_MAJOR               0xffff0000
@@ -35 +39 @@
 #define B_HAIKU_ABI_GCC_2_BEOS          0x00020001
 #define B_HAIKU_ABI_GCC_2_HAIKU         0x00020002
 
+#define B_HAIKU_ABI_NAME                __HAIKU_ARCH_ABI
+
 #if __GNUC__ == 2
 #   define B_HAIKU_ABI                  B_HAIKU_ABI_GCC_2_HAIKU
-#elif __GNUC__ == 3 || __GNUC__ == 4
+#elif __GNUC__ == 4
 #   define B_HAIKU_ABI                  B_HAIKU_ABI_GCC_4
 #else
 #   error Unsupported gcc version!
@@ -74 +80 @@
 #define B_DEFINE_SYMBOL_VERSION(function, versionedSymbol)  \
     __asm__(".symver " function "," versionedSymbol)
 
-
-#define _IMPEXP_ROOT
-#define _IMPEXP_BE
+#define B_DEFINE_WEAK_ALIAS(name, alias_name)   \
+    __typeof(name) alias_name __attribute__((weak, alias(#name)))
 
 
 #endif  /* _BE_BUILD_H */