#define LONGSTRING __extension__ in imports.h and use it to silence gcc
warnings about long string literals.
This commit is contained in:
parent
12e710c850
commit
11a54c38f7
|
@ -55,6 +55,15 @@ extern "C" {
|
|||
#define NULL 0
|
||||
#endif
|
||||
|
||||
|
||||
/** gcc -pedantic warns about long string literals, LONGSTRING silences that */
|
||||
#if !defined(__GNUC__) || (__GNUC__ < 2) || \
|
||||
((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
|
||||
# define LONGSTRING
|
||||
#else
|
||||
# define LONGSTRING __extension__
|
||||
#endif
|
||||
|
||||
/*@}*/
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Mesa 3-D graphics library
|
||||
* Version: 6.5.2
|
||||
* Version: 6.5.1
|
||||
*
|
||||
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
|
||||
*
|
||||
|
@ -77,12 +77,6 @@ struct arb_program
|
|||
};
|
||||
|
||||
|
||||
#ifndef __extension__
|
||||
#if !defined(__GNUC__) || (__GNUC__ < 2) || \
|
||||
((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
|
||||
# define __extension__
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* TODO:
|
||||
* Fragment Program Stuff:
|
||||
|
@ -168,10 +162,11 @@ struct arb_program
|
|||
|
||||
typedef GLubyte *production;
|
||||
|
||||
|
||||
/**
|
||||
* This is the text describing the rules to parse the grammar
|
||||
*/
|
||||
__extension__ static char arb_grammar_text[] =
|
||||
LONGSTRING static char arb_grammar_text[] =
|
||||
#include "arbprogram_syn.h"
|
||||
;
|
||||
|
||||
|
@ -4053,7 +4048,8 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
|
|||
program->Base.Parameters = ap.Base.Parameters;
|
||||
|
||||
#if DEBUG_FP
|
||||
_mesa_print_program(&program.Base);
|
||||
_mesa_printf("____________Fragment program %u ________\n", program->Base.ID);
|
||||
_mesa_print_program(&program->Base);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -4105,6 +4101,7 @@ _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
|
|||
program->Base.Parameters = ap.Base.Parameters;
|
||||
|
||||
#if DEBUG_VP
|
||||
_mesa_printf("____________Vertex program %u __________\n", program->Base.ID);
|
||||
_mesa_print_program(&program->Base);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Mesa 3-D graphics library
|
||||
* Version: 6.6
|
||||
* Version: 6.5.2
|
||||
*
|
||||
* Copyright (C) 2005-2006 Brian Paul All Rights Reserved.
|
||||
*
|
||||
|
@ -32,15 +32,15 @@
|
|||
#include "grammar_mesa.h"
|
||||
#include "slang_preprocess.h"
|
||||
|
||||
static const char *slang_pp_directives_syn =
|
||||
LONGSTRING static const char *slang_pp_directives_syn =
|
||||
#include "library/slang_pp_directives_syn.h"
|
||||
;
|
||||
|
||||
static const char *slang_pp_expression_syn =
|
||||
LONGSTRING static const char *slang_pp_expression_syn =
|
||||
#include "library/slang_pp_expression_syn.h"
|
||||
;
|
||||
|
||||
static const char *slang_pp_version_syn =
|
||||
LONGSTRING static const char *slang_pp_version_syn =
|
||||
#include "library/slang_pp_version_syn.h"
|
||||
;
|
||||
|
||||
|
|
Loading…
Reference in New Issue