X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fcompiler.h;h=43a06b43139da8fe35d94fd70863784b0ed5f6ac;hb=48e4fa7dd8c4b777989c4a731d6ac54cfe6c24eb;hp=b9f808efb3695155d315ea5b0736ed9da9a0e1da;hpb=f8ed0bbfef7b8e8098cb3263a196689dbd280758;p=mesa.git diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index b9f808efb36..43a06b43139 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -41,50 +41,6 @@ #include "c99_compat.h" /* inline, __func__, etc. */ -#ifdef __cplusplus -extern "C" { -#endif - - -/** - * Sun compilers define __i386 instead of the gcc-style __i386__ - */ -#ifdef __SUNPRO_C -# if !defined(__i386__) && defined(__i386) -# define __i386__ -# elif !defined(__amd64__) && defined(__amd64) -# define __amd64__ -# elif !defined(__sparc__) && defined(__sparc) -# define __sparc__ -# endif -#endif - - -/** - * Disable assorted warnings - */ -#if defined(_WIN32) && !defined(__CYGWIN__) -# if !defined(__GNUC__) /* mingw environment */ -# pragma warning( disable : 4068 ) /* unknown pragma */ -# pragma warning( disable : 4710 ) /* function 'foo' not inlined */ -# pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */ -# pragma warning( disable : 4127 ) /* conditional expression is constant */ -# if defined(MESA_MINWARN) -# pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */ -# pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */ -# pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */ -# pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */ -# pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ -# endif -# endif -#endif - - -/* XXX: Use standard `__func__` instead */ -#ifndef __FUNCTION__ -# define __FUNCTION__ __func__ -#endif - /** * Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN, and CPU_TO_LE32. * Do not use these unless absolutely necessary! @@ -113,22 +69,8 @@ extern "C" { #define LE32_TO_CPU( x ) CPU_TO_LE32( x ) -/** - * LONGSTRING macro - * gcc -pedantic warns about long string literals, LONGSTRING silences that. - */ -#if !defined(__GNUC__) -# define LONGSTRING -#else -# define LONGSTRING __extension__ -#endif #define IEEE_ONE 0x3f800000 -#ifdef __cplusplus -} -#endif - - #endif /* COMPILER_H */