[Scummvm-cvs-logs] SF.net SVN: scummvm:[46205] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 46205
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46205&view=rev
Author:   fingolfin
Date:     2009-11-29 21:56:10 +0000 (Sun, 29 Nov 2009)

Log Message:
-----------
COMMON: Replace NORETURN by NORETURN_PRE & NORETURN_POST

Modified Paths:
--------------
    scummvm/trunk/common/scummsys.h
    scummvm/trunk/common/textconsole.cpp
    scummvm/trunk/common/textconsole.h

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2009-11-29 21:32:25 UTC (rev 46204)
+++ scummvm/trunk/common/scummsys.h	2009-11-29 21:56:10 UTC (rev 46205)
@@ -187,7 +187,7 @@
 
 	#ifndef __GNUC__
 		#define FORCEINLINE __forceinline
-		#define NORETURN __declspec(noreturn)
+		#define NORETURN_PRE __declspec(noreturn)
 	#endif
 	#define PLUGIN_EXPORT __declspec(dllexport)
 
@@ -204,7 +204,7 @@
 	#define SCUMM_LITTLE_ENDIAN
 
 	#define FORCEINLINE __forceinline
-	#define NORETURN __declspec(noreturn)
+	#define NORETURN_PRE __declspec(noreturn)
 	#define PLUGIN_EXPORT __declspec(dllexport)
 
 
@@ -350,7 +350,7 @@
 // GCC specific stuff
 //
 #if defined(__GNUC__)
-	#define NORETURN __attribute__((__noreturn__))
+	#define NORETURN_POST __attribute__((__noreturn__))
 	#define PACKED_STRUCT __attribute__((__packed__))
 	#define GCC_PRINTF(x,y) __attribute__((__format__(printf, x, y)))
 
@@ -374,10 +374,14 @@
 #define PLUGIN_EXPORT
 #endif
 
-#ifndef NORETURN
-#define	NORETURN
+#ifndef NORETURN_PRE
+#define	NORETURN_PRE
 #endif
 
+#ifndef NORETURN_POST
+#define	NORETURN_POST
+#endif
+
 #ifndef STRINGBUFLEN
 #define STRINGBUFLEN 1024
 #endif

Modified: scummvm/trunk/common/textconsole.cpp
===================================================================
--- scummvm/trunk/common/textconsole.cpp	2009-11-29 21:32:25 UTC (rev 46204)
+++ scummvm/trunk/common/textconsole.cpp	2009-11-29 21:56:10 UTC (rev 46205)
@@ -73,7 +73,7 @@
 
 #endif
 
-void NORETURN error(const char *s, ...) {
+void NORETURN_PRE error(const char *s, ...) {
 	char buf_input[STRINGBUFLEN];
 	char buf_output[STRINGBUFLEN];
 	va_list va;

Modified: scummvm/trunk/common/textconsole.h
===================================================================
--- scummvm/trunk/common/textconsole.h	2009-11-29 21:32:25 UTC (rev 46204)
+++ scummvm/trunk/common/textconsole.h	2009-11-29 21:56:10 UTC (rev 46205)
@@ -62,11 +62,7 @@
 }	// End of namespace Common
 
 
-#if defined(__GNUC__)
-void error(const char *s, ...) GCC_PRINTF(1, 2) NORETURN;
-#else
-void NORETURN error(const char *s, ...);
-#endif
+void NORETURN_PRE error(const char *s, ...) GCC_PRINTF(1, 2) NORETURN_POST;
 
 #ifdef DISABLE_TEXT_CONSOLE
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.