diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2010-08-03 20:21:52 -0700 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-08-04 15:57:20 -0700 |
commit | 1ffc1cd86186ae5d03bb28a1e041c4a57761515e (patch) | |
tree | b8d694f7d27609ea6382415de379314b52814968 /src/glsl/glcpp/glcpp.h | |
parent | ad98aa9d93646600cc95b3e45a40eec26f18988a (diff) |
glcpp: Remove xtalloc wrappers in favor of plain talloc.
Calling exit() on a memory failure probably made sense for the
standalone preprocessor, but doesn't seem too appealing as part of
the GL library. Also, we don't use it in the main compiler.
Diffstat (limited to 'src/glsl/glcpp/glcpp.h')
-rw-r--r-- | src/glsl/glcpp/glcpp.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/glsl/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h index 0ccd957eda..0bebdb9ae8 100644 --- a/src/glsl/glcpp/glcpp.h +++ b/src/glsl/glcpp/glcpp.h @@ -219,28 +219,4 @@ glcpp_lex_destroy (yyscan_t scanner); int yyparse (glcpp_parser_t *parser); -/* xtalloc - wrappers around talloc to check for out-of-memory */ - -#define xtalloc(ctx, type) (type *)xtalloc_named_const(ctx, sizeof(type), #type) - -#define xtalloc_size(ctx, size) xtalloc_named_const(ctx, size, __location__) - -void * -xtalloc_named_const (const void *context, size_t size, const char *name); - -char * -xtalloc_strdup (const void *t, const char *p); - -char * -xtalloc_strndup (const void *t, const char *p, size_t n); - -char * -xtalloc_asprintf (const void *t, const char *fmt, ...); - -void * -_xtalloc_reference_loc (const void *context, - const void *ptr, const char *location); - -#define xtalloc_reference(ctx, ptr) (_TALLOC_TYPEOF(ptr))_xtalloc_reference_loc((ctx),(ptr), __location__) - #endif |