Remove support for GCC older than 3.3.0
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
parent
9aa3aa7138
commit
016fc30839
|
@ -67,8 +67,7 @@
|
|||
#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
|
||||
# define GLAPI extern
|
||||
# define GLAPIENTRY __stdcall
|
||||
#elif (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
|
||||
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
#elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
# define GLAPI __attribute__((visibility("default")))
|
||||
# define GLAPIENTRY
|
||||
#endif /* WIN32 && !CYGWIN */
|
||||
|
|
|
@ -103,7 +103,7 @@ extern "C" {
|
|||
# define GLUTAPI extern
|
||||
#endif
|
||||
|
||||
#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
|
||||
#elif defined(__GNUC__)
|
||||
|
||||
# define GLUTAPIENTRY
|
||||
# define GLUTAPIENTRYV
|
||||
|
|
|
@ -64,8 +64,7 @@
|
|||
/**
|
||||
* Function visibility
|
||||
*/
|
||||
#if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
|
||||
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
# define PUBLIC __attribute__((visibility("default")))
|
||||
#else
|
||||
# define PUBLIC
|
||||
|
@ -79,7 +78,7 @@
|
|||
#ifndef __FUNCTION__
|
||||
# if defined(__VMS)
|
||||
# define __FUNCTION__ "VMS$NL:"
|
||||
# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
|
||||
# elif (!defined __GNUC__) && (!defined __xlC__) && \
|
||||
(!defined(_MSC_VER) || _MSC_VER < 1300)
|
||||
# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
|
||||
(defined(__SUNPRO_C) && defined(__C99FEATURES__))
|
||||
|
|
|
@ -106,8 +106,7 @@ typedef unsigned char boolean;
|
|||
|
||||
/* Function visibility */
|
||||
#ifndef PUBLIC
|
||||
# if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
|
||||
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
# define PUBLIC __attribute__((visibility("default")))
|
||||
# else
|
||||
# define PUBLIC
|
||||
|
@ -119,7 +118,7 @@ typedef unsigned char boolean;
|
|||
* If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
|
||||
*/
|
||||
#ifndef __FUNCTION__
|
||||
# if (!defined(__GNUC__) || (__GNUC__ < 2))
|
||||
# if !defined(__GNUC__)
|
||||
# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
|
||||
(defined(__SUNPRO_C) && defined(__C99FEATURES__))
|
||||
# define __FUNCTION__ __func__
|
||||
|
@ -145,7 +144,7 @@ typedef unsigned char boolean;
|
|||
|
||||
|
||||
|
||||
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
|
||||
#if defined(__GNUC__)
|
||||
#define PIPE_DEPRECATED __attribute__((__deprecated__))
|
||||
#else
|
||||
#define PIPE_DEPRECATED
|
||||
|
|
|
@ -45,7 +45,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "xf86dristr.h"
|
||||
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
|
||||
#if defined(__GNUC__)
|
||||
# define PUBLIC __attribute__((visibility("default")))
|
||||
# define USED __attribute__((used))
|
||||
#else
|
||||
|
|
|
@ -69,7 +69,7 @@
|
|||
* We also need to define a USED attribute, so the optimizer doesn't
|
||||
* inline a static function that we later use in an alias. - ajax
|
||||
*/
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
|
||||
#if defined(__GNUC__)
|
||||
# define PUBLIC __attribute__((visibility("default")))
|
||||
# define USED __attribute__((used))
|
||||
#else
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "indirect_vertex_array.h"
|
||||
#include <GL/glxproto.h>
|
||||
|
||||
#if !defined __GNUC__ || __GNUC__ < 3
|
||||
#if !defined(__GNUC__)
|
||||
# define __builtin_expect(x, y) x
|
||||
#endif
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "glxclient.h"
|
||||
#include "indirect.h"
|
||||
|
||||
#if !defined __GNUC__ || __GNUC__ < 3
|
||||
#if !defined(__GNUC__)
|
||||
# define __builtin_expect(x, y) x
|
||||
#endif
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ typedef void (*_glapi_proc)(void); /* generic function pointer */
|
|||
#endif
|
||||
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ >= 3)
|
||||
#if defined(__GNUC__)
|
||||
# define likely(x) __builtin_expect(!!(x), 1)
|
||||
# define unlikely(x) __builtin_expect(!!(x), 0)
|
||||
#else
|
||||
|
|
|
@ -173,8 +173,7 @@ extern "C" {
|
|||
* We also need to define a USED attribute, so the optimizer doesn't
|
||||
* inline a static function that we later use in an alias. - ajax
|
||||
*/
|
||||
#if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
|
||||
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
|
||||
# define PUBLIC __attribute__((visibility("default")))
|
||||
# define USED __attribute__((used))
|
||||
#else
|
||||
|
@ -197,7 +196,7 @@ extern "C" {
|
|||
/**
|
||||
* __builtin_expect macros
|
||||
*/
|
||||
#if (!defined(__GNUC__) || __GNUC__ < 3) && (!defined(__IBMC__) || __IBMC__ < 900)
|
||||
#if !defined(__GNUC__)
|
||||
# define __builtin_expect(x, y) x
|
||||
#endif
|
||||
|
||||
|
@ -210,7 +209,7 @@ extern "C" {
|
|||
#ifndef __FUNCTION__
|
||||
# if defined(__VMS)
|
||||
# define __FUNCTION__ "VMS$NL:"
|
||||
# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
|
||||
# elif !defined(__GNUC__) && !defined(__xlC__) && \
|
||||
(!defined(_MSC_VER) || _MSC_VER < 1300)
|
||||
# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
|
||||
(defined(__SUNPRO_C) && defined(__C99FEATURES__))
|
||||
|
@ -322,8 +321,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
|
|||
* LONGSTRING macro
|
||||
* gcc -pedantic warns about long string literals, LONGSTRING silences that.
|
||||
*/
|
||||
#if !defined(__GNUC__) || (__GNUC__ < 2) || \
|
||||
((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
|
||||
#if !defined(__GNUC__)
|
||||
# define LONGSTRING
|
||||
#else
|
||||
# define LONGSTRING __extension__
|
||||
|
|
|
@ -240,9 +240,7 @@ static INLINE int GET_FLOAT_BITS( float x )
|
|||
/***
|
||||
*** IROUND: return (as an integer) float rounded to nearest integer
|
||||
***/
|
||||
#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__) && \
|
||||
(!(defined(__BEOS__) || defined(__HAIKU__)) || \
|
||||
(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)))
|
||||
#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
|
||||
static INLINE int iround(float f)
|
||||
{
|
||||
int r;
|
||||
|
|
|
@ -1737,7 +1737,7 @@ SECTION _DATA public align=16 class=DATA use32 flat
|
|||
*/
|
||||
#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
|
||||
# define HIDDEN(x) .hidden x
|
||||
#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
|
||||
#elif defined(__GNUC__) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
|
||||
# pragma GCC visibility push(default)
|
||||
# define HIDDEN(x) .hidden x
|
||||
#else
|
||||
|
|
Loading…
Reference in New Issue