diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-05-28 15:30:53 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-05-28 15:30:53 +0000 |
| commit | d18c08fe890e100269be8d5cccbaf7cd7bf9916d (patch) | |
| tree | 4cf527b439964f2be44cd709da5396fcb8b73f87 /src/mesa | |
| parent | 0b52018df2a64a159f697756fbda47bcd1de3ef4 (diff) | |
silence some warnings (Evgeny Kotsuba)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/math/m_trans_tmp.h | 27 | ||||
| -rw-r--r-- | src/mesa/math/m_translate.c | 8 | ||||
| -rw-r--r-- | src/mesa/tnl/t_imm_api.c | 5 | ||||
| -rw-r--r-- | src/mesa/tnl/t_imm_elt.c | 3 |
4 files changed, 31 insertions, 12 deletions
diff --git a/src/mesa/math/m_trans_tmp.h b/src/mesa/math/m_trans_tmp.h index 9020bcadda..2ade71e4b6 100644 --- a/src/mesa/math/m_trans_tmp.h +++ b/src/mesa/math/m_trans_tmp.h @@ -1,10 +1,8 @@ -/* $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 + diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c index 0c4a1b1631..def657e1c8 100644 --- a/src/mesa/math/m_translate.c +++ b/src/mesa/math/m_translate.c @@ -1,10 +1,8 @@ -/* $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 diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c index 0eef3b735c..cc7f42f384 100644 --- a/src/mesa/tnl/t_imm_api.c +++ b/src/mesa/tnl/t_imm_api.c @@ -1,5 +1,3 @@ -/* $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"); \ diff --git a/src/mesa/tnl/t_imm_elt.c b/src/mesa/tnl/t_imm_elt.c index 08b74a139b..f9a3069a17 100644 --- a/src/mesa/tnl/t_imm_elt.c +++ b/src/mesa/tnl/t_imm_elt.c @@ -584,8 +584,9 @@ static void init_translate_elt(void) #undef CLASS #undef ARGS #undef CHECK +#ifdef START #undef START - +#endif |