diff options
| author | Marcus Holland-Moritz <mhx-perl@gmx.net> | 2008-10-24 21:38:48 +0000 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2009-01-03 19:18:19 +0000 |
| commit | dbbe514e2190096ec73ac900b929a5a277e962bb (patch) | |
| tree | dae2c671d8ca3dcdeed8cd8d506eef13a9bf1cd1 /util.c | |
| parent | c4474676cb259d6c0d2b0881661fcc8511978bd7 (diff) | |
| download | perl-dbbe514e2190096ec73ac900b929a5a277e962bb.tar.gz | |
Make C++ compilers happy #1: "typename" is a C++ keyword.
p4raw-id: //depot/perl@34574
(cherry-picked from commit bef8a12803580c2fb97a03ebe6e7df3e52cd10bf)
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -5469,7 +5469,7 @@ Perl_free_global_struct(pTHX_ struct perl_vars *plvarsp) # endif static void -S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const char *typename, const SV *sv, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) +S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const char *type_name, const SV *sv, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) { # if defined(PERL_MEM_LOG_ENV) || defined(PERL_MEM_LOG_ENV_FD) const char *s; @@ -5522,14 +5522,14 @@ S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const cha "alloc: %s:%d:%s: %"IVdf" %"UVuf " %s = %"IVdf": %"UVxf"\n", filename, linenumber, funcname, n, typesize, - typename, n * typesize, PTR2UV(newalloc)); + type_name, n * typesize, PTR2UV(newalloc)); break; case MLT_REALLOC: len = my_snprintf(buf, sizeof(buf), "realloc: %s:%d:%s: %"IVdf" %"UVuf " %s = %"IVdf": %"UVxf" -> %"UVxf"\n", filename, linenumber, funcname, n, typesize, - typename, n * typesize, PTR2UV(oldalloc), + type_name, n * typesize, PTR2UV(oldalloc), PTR2UV(newalloc)); break; case MLT_FREE: @@ -5554,19 +5554,19 @@ S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const cha #endif Malloc_t -Perl_mem_log_alloc(const UV n, const UV typesize, const char *typename, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) +Perl_mem_log_alloc(const UV n, const UV typesize, const char *type_name, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) { #ifdef PERL_MEM_LOG_STDERR - mem_log_common(MLT_ALLOC, n, typesize, typename, NULL, NULL, newalloc, filename, linenumber, funcname); + mem_log_common(MLT_ALLOC, n, typesize, type_name, NULL, NULL, newalloc, filename, linenumber, funcname); #endif return newalloc; } Malloc_t -Perl_mem_log_realloc(const UV n, const UV typesize, const char *typename, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) +Perl_mem_log_realloc(const UV n, const UV typesize, const char *type_name, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) { #ifdef PERL_MEM_LOG_STDERR - mem_log_common(MLT_REALLOC, n, typesize, typename, NULL, oldalloc, newalloc, filename, linenumber, funcname); + mem_log_common(MLT_REALLOC, n, typesize, type_name, NULL, oldalloc, newalloc, filename, linenumber, funcname); #endif return newalloc; } |