hrev52126 adds 2 changesets to branch 'master'
old head: 2ff22d6734176a2cf93a05c6842f69ef59d27a26
new head: 679518f417b85aa6bea3407877f36cbb1414beb2
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=679518f417b8+%5E2ff22d673417
----------------------------------------------------------------------------
4a062f23c673: glut: fix a warning on x86_64.
679518f417b8: setjmp.h: add noreturn keyword on longjmp variants.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 8 insertions(+), 5 deletions(-)
headers/posix/setjmp.h | 11 +++++++----
src/libs/glut/glutGameMode.cpp | 2 +-
############################################################################
Commit: 4a062f23c6736cf29b37c631aa615918a35f8c2e
URL: https://git.haiku-os.org/haiku/commit/?id=4a062f23c673
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Jul 21 10:22:01 2018 UTC
glut: fix a warning on x86_64.
----------------------------------------------------------------------------
diff --git a/src/libs/glut/glutGameMode.cpp b/src/libs/glut/glutGameMode.cpp
index dada4212ac..b3eb2961c5 100644
--- a/src/libs/glut/glutGameMode.cpp
+++ b/src/libs/glut/glutGameMode.cpp
@@ -207,7 +207,7 @@ GlutGameMode::_FindMatchingMode()
int bestMode = -1;
for (uint32 i =0; i < fModesCount; i++) {
- printf("[%ld]: %d x %d, %d Bpp, %d Hz\n", i,
+ printf("[%" B_PRId32 "]: %d x %d, %d Bpp, %d Hz\n", i,
fModesList[i].virtual_width,
fModesList[i].virtual_height,
_GetModePixelDepth(&fModesList[i]),
_GetModeRefreshRate(&fModesList[i]));
############################################################################
Revision: hrev52126
Commit: 679518f417b85aa6bea3407877f36cbb1414beb2
URL: https://git.haiku-os.org/haiku/commit/?id=679518f417b8
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Jul 21 10:23:42 2018 UTC
setjmp.h: add noreturn keyword on longjmp variants.
----------------------------------------------------------------------------
diff --git a/headers/posix/setjmp.h b/headers/posix/setjmp.h
index 67f4ec04be..a04f954e96 100644
--- a/headers/posix/setjmp.h
+++ b/headers/posix/setjmp.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2012 Haiku, Inc.
+ * Copyright 2004-2018 Haiku, Inc.
* Distributed under the terms of the MIT License.
*/
#ifndef _SETJMP_H_
@@ -29,9 +29,12 @@ extern int _setjmp(jmp_buf jumpBuffer);
extern int setjmp(jmp_buf jumpBuffer);
extern int sigsetjmp(jmp_buf jumpBuffer, int saveMask);
-extern void _longjmp(jmp_buf jumpBuffer, int value);
-extern void longjmp(jmp_buf jumpBuffer, int value);
-extern void siglongjmp(sigjmp_buf jumpBuffer, int value);
+extern void _longjmp(jmp_buf jumpBuffer, int value)
+ __attribute__ ((noreturn));
+extern void longjmp(jmp_buf jumpBuffer, int value)
+ __attribute__ ((noreturn));
+extern void siglongjmp(sigjmp_buf jumpBuffer, int value)
+ __attribute__ ((noreturn));
#ifdef __cplusplus
}
