[haiku-commits] haiku: hrev48943 - in src: system/libroot/posix/arch/x86 add-ons/kernel/drivers/audio/ice1712 system/libroot/posix/glibc/arch/generic
- From: jerome.duval@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 28 Mar 2015 09:42:08 +0100 (CET)
hrev48943 adds 2 changesets to branch 'master'
old head: 83d05088a30dc107892e87160e37f1f29a00234f
new head: c5b66b40ab3537e2323dbf0d4814fcf12c4dff90
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=c5b66b40ab35+%5E83d05088a30d
----------------------------------------------------------------------------
d789b5e208f3: ice1712: fix debug build
c5b66b40ab35: use macro instead of attributes for weak aliases.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 15 insertions(+), 7 deletions(-)
src/add-ons/kernel/drivers/audio/ice1712/debug.h | 8 ++++++++
src/add-ons/kernel/drivers/audio/ice1712/ice1712.h | 8 ++++----
src/system/libroot/posix/arch/x86/fenv.c | 4 ++--
src/system/libroot/posix/glibc/arch/generic/w_dremf.c | 2 +-
############################################################################
Commit: d789b5e208f3a58c762541401fc2a629ca5a534f
URL: http://cgit.haiku-os.org/haiku/commit/?id=d789b5e208f3
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Mar 28 08:33:54 2015 UTC
ice1712: fix debug build
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/debug.h
b/src/add-ons/kernel/drivers/audio/ice1712/debug.h
index f75da2c..69ec02a 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/debug.h
+++ b/src/add-ons/kernel/drivers/audio/ice1712/debug.h
@@ -26,4 +26,12 @@
# define ITRACE_VV(a...) (void)0
#endif
+#undef ASSERT
+#if DEBUG > 0
+ #define ASSERT(a) if (a) {} else \
+ dprintf("ASSERT failed! file = %s, line =
%d\n",__FILE__,__LINE__)
+#else
+ #define ASSERT(a) ((void)(0))
+#endif
+
#endif // _DEBUG_ICE1712_H_
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
index 574b670..8538124 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
+++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
@@ -7,17 +7,17 @@
* Marcus Overhagen, marcus@xxxxxxxxxxxx
* Jérôme Lévêque, leveque.jerome@xxxxxxxxx
*/
-
-
#ifndef _ICE1712_H_
#define _ICE1712_H_
-#include "debug.h"
-#include "hmulti_audio.h"
#include <PCI.h>
#include <KernelExport.h>
+#include "debug.h"
+#include "hmulti_audio.h"
+
+
#define DRIVER_NAME "ice1712"
#define VERSION "0.6"
############################################################################
Revision: hrev48943
Commit: c5b66b40ab3537e2323dbf0d4814fcf12c4dff90
URL: http://cgit.haiku-os.org/haiku/commit/?id=c5b66b40ab35
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Mar 28 08:40:29 2015 UTC
use macro instead of attributes for weak aliases.
----------------------------------------------------------------------------
diff --git a/src/system/libroot/posix/arch/x86/fenv.c
b/src/system/libroot/posix/arch/x86/fenv.c
index 1884bc1..b0c657b 100644
--- a/src/system/libroot/posix/arch/x86/fenv.c
+++ b/src/system/libroot/posix/arch/x86/fenv.c
@@ -207,5 +207,5 @@ __fedisableexcept(int mask)
return (~omask);
}
-int feenableexcept(int) __attribute__((weak, alias("__feenableexcept")));
-int fedisableexcept(int) __attribute__((weak, alias("__fedisableexcept")));
+__weak_reference(__feenableexcept, feenableexcept);
+__weak_reference(__fedisableexcept, fedisableexcept);
diff --git a/src/system/libroot/posix/glibc/arch/generic/w_dremf.c
b/src/system/libroot/posix/glibc/arch/generic/w_dremf.c
index e040d98..eae446b 100644
--- a/src/system/libroot/posix/glibc/arch/generic/w_dremf.c
+++ b/src/system/libroot/posix/glibc/arch/generic/w_dremf.c
@@ -13,5 +13,5 @@ __dremf(float x, float y)
{
return __remainderf(x, y);
}
+weak_alias (__dremf, dremf)
-float dremf(float, float) __attribute__((weak, alias("__dremf")));
Other related posts:
- » [haiku-commits] haiku: hrev48943 - in src: system/libroot/posix/arch/x86 add-ons/kernel/drivers/audio/ice1712 system/libroot/posix/glibc/arch/generic - jerome . duval
