diff options
| author | Jan Dubois <jand@activestate.com> | 2010-10-21 18:00:14 -0700 |
|---|---|---|
| committer | Jan Dubois <jand@activestate.com> | 2010-10-21 18:00:14 -0700 |
| commit | 158cfab664aa2a959a6c55c0d53a15678d5ffb0b (patch) | |
| tree | 4d3bf809df32e222339b48f45a17306c0ff96a23 /malloc_ctl.h | |
| parent | 8cc86590c5aa026ef05d88e777ab02f3434e8415 (diff) | |
| download | perl-158cfab664aa2a959a6c55c0d53a15678d5ffb0b.tar.gz | |
Fix calling conventions in malloc_ctl.h
The Perl_malloc() etc. functions are *also* declared in
proto.h, so the declarations need to match. The inclusion
of malloc_ctl.h into perl.h had to be moved down until
after the point where PERL_CALLCONV was completely defined.
Diffstat (limited to 'malloc_ctl.h')
| -rw-r--r-- | malloc_ctl.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/malloc_ctl.h b/malloc_ctl.h index 7a6aed0db7..d74637289b 100644 --- a/malloc_ctl.h +++ b/malloc_ctl.h @@ -14,14 +14,12 @@ struct perl_mstats { }; typedef struct perl_mstats perl_mstats_t; -START_EXTERN_C -Malloc_t Perl_malloc (MEM_SIZE nbytes); -Malloc_t Perl_calloc (MEM_SIZE elements, MEM_SIZE size); -Malloc_t Perl_realloc (Malloc_t where, MEM_SIZE nbytes); +PERL_CALLCONV Malloc_t Perl_malloc (MEM_SIZE nbytes); +PERL_CALLCONV Malloc_t Perl_calloc (MEM_SIZE elements, MEM_SIZE size); +PERL_CALLCONV Malloc_t Perl_realloc (Malloc_t where, MEM_SIZE nbytes); /* 'mfree' rather than 'free', since there is already a 'perl_free' * that causes clashes with case-insensitive linkers */ -Free_t Perl_mfree (Malloc_t where); -END_EXTERN_C +PERL_CALLCONV Free_t Perl_mfree (Malloc_t where); #ifndef NO_MALLOC_DYNAMIC_CFG |