Commit d18c08fe authored by Brian Paul's avatar Brian Paul
Browse files

silence some warnings (Evgeny Kotsuba)

parent 0b52018d
/* $Id: m_trans_tmp.h,v 1.7 2002/01/30 16:52:02 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 4.0.2
* Version: 5.1
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
......@@ -224,13 +222,34 @@ static void INIT(void)
}
#ifdef INIT
#undef INIT
#endif
#ifdef DEST_1UI
#undef DEST_1UI
#endif
#ifdef DEST_1UB
#undef DEST_1UB
#endif
#ifdef DEST_4UB
#undef DEST_4UB
#endif
#ifdef DEST_4US
#undef DEST_4US
#endif
#ifdef DEST_3F
#undef DEST_3F
#endif
#ifdef DEST_4F
#undef DEST_4F
#endif
#ifdef DEST_1F
#undef DEST_1F
#endif
#ifdef SZ
#undef SZ
#endif
#ifdef TAG
#undef TAG
#endif
/* $Id: m_translate.c,v 1.11 2003/03/01 01:50:24 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 4.1
* Version: 5.1
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
......@@ -550,7 +548,9 @@ static void init_translate_raw(void)
#undef TAB
#ifdef CLASS
#undef CLASS
#endif
#undef ARGS
#undef CHECK
#undef SRC_START
......
/* $Id: t_imm_api.c,v 1.40 2003/03/31 18:19:56 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 5.1
......@@ -405,7 +403,8 @@ _tnl_End(void)
*/
#define CHECK_ATTRIB_ARRAY(IM, ATTR) \
if (!IM->Attrib[ATTR]) { \
IM->Attrib[ATTR] = _mesa_malloc(IMM_SIZE * 4 * sizeof(GLfloat)); \
IM->Attrib[ATTR] = \
(GLfloat (*)[4]) _mesa_malloc(IMM_SIZE * 4 * sizeof(GLfloat)); \
if (!IM->Attrib[ATTR]) { \
GET_CURRENT_CONTEXT(ctx); \
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glVertex/Normal/etc"); \
......
......@@ -584,8 +584,9 @@ static void init_translate_elt(void)
#undef CLASS
#undef ARGS
#undef CHECK
#ifdef START
#undef START
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment