AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'kwg/fixes'

Browse Source
This commit is contained in:
Carl Worth
2010-06-09 13:29:37 -07:00
parent 5ae88af988 2ab0b13dd9
commit 2fb30a2e49
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glcpp-parse.y
+20
View File
@@ -1384,6 +1384,22 @@ _glcpp_parser_print_expanded_token_list (glcpp_parser_t *parser,
_token_list_print (list);
}
void
_check_for_reserved_macro_name (const char *identifier)
{
/* According to the GLSL specification, macro names starting with "__"
* or "GL_" are reserved for future use. So, don't allow them.
*/
if (strncmp(identifier, "__", 2) == 0) {
fprintf (stderr, "Error: Macro names starting with \"__\" are reserved.\n");
exit(1);
}
if (strncmp(identifier, "GL_", 3) == 0) {
fprintf (stderr, "Error: Macro names starting with \"GL_\" are reserved.\n");
exit(1);
}
}
void
_define_object_macro (glcpp_parser_t *parser,
const char *identifier,
@@ -1391,6 +1407,8 @@ _define_object_macro (glcpp_parser_t *parser,
{
macro_t *macro;
_check_for_reserved_macro_name(identifier);
macro = xtalloc (parser, macro_t);
macro->is_function = 0;
@@ -1409,6 +1427,8 @@ _define_function_macro (glcpp_parser_t *parser,
{
macro_t *macro;
_check_for_reserved_macro_name(identifier);
macro = xtalloc (parser, macro_t);
macro->is_function = 1;