hrev50521 adds 2 changesets to branch 'master'
old head: 6980817672375123fddb84a8e812ffbc91bff40c
new head: 2080509cb0de018555cbf4d80f09e94300940022
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=2080509cb0de+%5E698081767237
----------------------------------------------------------------------------
96658eaed944: elf.h: add some defines from Linux version
For completeness and compatibility.
2080509cb0de: Fix some missing parentheses
* Problem found by gcc4.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 9 insertions(+), 6 deletions(-)
headers/os/kernel/elf.h | 7 +++++--
.../kernel/drivers/graphics/intel_extreme/intel_extreme.cpp | 4 ++--
src/system/libroot/posix/termios.c | 4 ++--
############################################################################
Commit: 96658eaed944d02b1524753e0172b7bddd12b134
URL: http://cgit.haiku-os.org/haiku/commit/?id=96658eaed944
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Sat Aug 27 07:10:01 2016 UTC
elf.h: add some defines from Linux version
For completeness and compatibility.
----------------------------------------------------------------------------
diff --git a/headers/os/kernel/elf.h b/headers/os/kernel/elf.h
index 5155a2e..f3f404b 100644
--- a/headers/os/kernel/elf.h
+++ b/headers/os/kernel/elf.h
@@ -148,9 +148,12 @@ typedef struct {
#define EM_X86_64 62 /* Advanced Micro Devices X86-64 processor */
/* architecture class (EI_CLASS) */
-#define ELFCLASS32 1
-#define ELFCLASS64 2
+#define ELFCLASSNONE 0
+#define ELFCLASS32 1
+#define ELFCLASS64 2
+
/* endian (EI_DATA) */
+#define ELFDATANONE 0 /* invalid */
#define ELFDATA2LSB 1 /* little endian */
#define ELFDATA2MSB 2 /* big endian */
############################################################################
Revision: hrev50521
Commit: 2080509cb0de018555cbf4d80f09e94300940022
URL: http://cgit.haiku-os.org/haiku/commit/?id=2080509cb0de
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Sat Aug 27 07:31:16 2016 UTC
Fix some missing parentheses
* Problem found by gcc4.
----------------------------------------------------------------------------
diff --git
a/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
b/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
index d9eac27..3ff213d 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
@@ -98,7 +98,7 @@ intel_get_interrupt_mask(intel_info& info, int pipes, bool
enable)
// Intel changed the PCH register mapping between Sandy Bridge and the
// later generations (Ivy Bridge and up).
- if (pipes & INTEL_PIPE_A != 0) {
+ if ((pipes & INTEL_PIPE_A) != 0) {
if (info.device_type.InGroup(INTEL_GROUP_SNB))
mask |= PCH_INTERRUPT_VBLANK_PIPEA_SNB;
else if (hasPCH)
@@ -107,7 +107,7 @@ intel_get_interrupt_mask(intel_info& info, int pipes, bool
enable)
mask |= INTERRUPT_VBLANK_PIPEA;
}
- if (pipes & INTEL_PIPE_B != 0) {
+ if ((pipes & INTEL_PIPE_B) != 0) {
if (info.device_type.InGroup(INTEL_GROUP_SNB))
mask |= PCH_INTERRUPT_VBLANK_PIPEB_SNB;
else if (hasPCH)
diff --git a/src/system/libroot/posix/termios.c
b/src/system/libroot/posix/termios.c
index 07851e9..f60602e 100644
--- a/src/system/libroot/posix/termios.c
+++ b/src/system/libroot/posix/termios.c
@@ -105,7 +105,7 @@ tcsendbreak(int fd, int duration)
speed_t
cfgetispeed(const struct termios *termios)
{
- if (termios->c_cflag & CBAUD == CBAUD)
+ if ((termios->c_cflag & CBAUD) == CBAUD)
return termios->c_ispeed;
return termios->c_cflag & CBAUD;
@@ -134,7 +134,7 @@ cfsetispeed(struct termios *termios, speed_t speed)
speed_t
cfgetospeed(const struct termios *termios)
{
- if (termios->c_cflag & CBAUD == CBAUD)
+ if ((termios->c_cflag & CBAUD) == CBAUD)
return termios->c_ospeed;
return termios->c_cflag & CBAUD;
