* clang support

This commit is contained in:
Tim Angus 2011-10-21 22:48:53 +00:00
parent f9cde509b2
commit 675e7a641a
9 changed files with 19 additions and 14 deletions

View file

@ -276,7 +276,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
endif
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-pipe -DUSE_ICON
-Wno-self-assign -pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer

View file

@ -55,9 +55,9 @@ void qsnapvectorsse(vec3_t vec)
#define QROUNDX87(src) \
"flds " src "\n" \
"fistp " src "\n" \
"fild " src "\n" \
"fstp " src "\n"
"fistpl " src "\n" \
"fildl " src "\n" \
"fstpl " src "\n"
void qsnapvectorx87(vec3_t vec)
{

View file

@ -1173,7 +1173,7 @@ bot_matchpiece_t *BotLoadMatchPieces(source_t *source, char *endtoken)
{
if (token.type == TT_NUMBER && (token.subtype & TT_INTEGER))
{
if (token.intvalue < 0 || token.intvalue >= MAX_MATCHVARIABLES)
if (token.intvalue >= MAX_MATCHVARIABLES)
{
SourceError(source, "can't have more than %d match variables\n", MAX_MATCHVARIABLES);
FreeSource(source);

View file

@ -954,7 +954,7 @@ static void G_VoiceTo( gentity_t *ent, gentity_t *other, int mode, const char *i
return;
}
// no chatting to players in tournements
if ( (g_gametype.integer == GT_TOURNAMENT )) {
if ( g_gametype.integer == GT_TOURNAMENT ) {
return;
}

View file

@ -2329,7 +2329,10 @@ A way to force a bus error for development reasons
=================
*/
static void Com_Crash_f( void ) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnull-dereference"
* ( int * ) 0 = 0x12345678;
#pragma clang diagnostic pop
}
/*

View file

@ -179,7 +179,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define OS_STRING "kFreeBSD"
#endif
#ifdef __clang__
#define ID_INLINE static inline
#else
#define ID_INLINE inline
#endif
#define PATH_SEP '/'
#if defined __i386__

View file

@ -1250,7 +1250,7 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len)
return UNZ_PARAMERROR;
if ((pfile_in_zip_read_info->read_buffer == NULL))
if (pfile_in_zip_read_info->read_buffer == NULL)
return UNZ_END_OF_LIST_OF_FILE;
if (len==0)
return 0;

View file

@ -284,9 +284,9 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na
LL( triangle->vertex[1] );
LL( triangle->vertex[2] );
if( triangle->vertex[0] < 0 || triangle->vertex[0] > header->num_vertexes ||
triangle->vertex[1] < 0 || triangle->vertex[1] > header->num_vertexes ||
triangle->vertex[2] < 0 || triangle->vertex[2] > header->num_vertexes ) {
if( triangle->vertex[0] > header->num_vertexes ||
triangle->vertex[1] > header->num_vertexes ||
triangle->vertex[2] > header->num_vertexes ) {
return qfalse;
}
}
@ -323,9 +323,7 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na
mesh->first_vertex + mesh->num_vertexes > header->num_vertexes ||
mesh->first_triangle >= header->num_triangles ||
mesh->first_triangle + mesh->num_triangles > header->num_triangles ||
mesh->name < 0 ||
mesh->name >= header->num_text ||
mesh->material < 0 ||
mesh->material >= header->num_text ) {
return qfalse;
}
@ -354,7 +352,6 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na
if( joint->parent < -1 ||
joint->parent >= (int)header->num_joints ||
joint->name < 0 ||
joint->name >= (int)header->num_text ) {
return qfalse;
}

View file

@ -219,7 +219,7 @@ void RE_AddRefEntityToScene( const refEntity_t *ent ) {
}
return;
}
if ( ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) {
if ( (int)ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) {
ri.Error( ERR_DROP, "RE_AddRefEntityToScene: bad reType %i", ent->reType );
}