summaryrefslogtreecommitdiff
path: root/malloc.c
diff options
context:
space:
mode:
authorChip Salzenberg <chip@atlantic.net>1996-12-06 18:56:00 +1200
committerChip Salzenberg <chip@atlantic.net>1996-12-06 18:56:00 +1200
commit72e5b9dbf80f1f145b123baae3bac637c1cfcf55 (patch)
tree24907f6518a4ebd8576ce6ea53ad37553b8da1b1 /malloc.c
parent57560dc7335aaed00185c3cccea22fe709754f18 (diff)
downloadperl-72e5b9dbf80f1f145b123baae3bac637c1cfcf55.tar.gz
_10+ under OS/2
(this is the same change as commit ed7f835f9a39da0c76fb197dc1746d7bd89b9537, but as applied)
Diffstat (limited to 'malloc.c')
-rw-r--r--malloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/malloc.c b/malloc.c
index 6ebe919379..6f22da6c4b 100644
--- a/malloc.c
+++ b/malloc.c
@@ -161,7 +161,7 @@ static u_int start_slack;
#endif /* TWO_POT_OPTIMIZE */
-#ifdef PERL_EMERGENCY_SBRK
+#if defined(PERL_EMERGENCY_SBRK) && defined(PERL_CORE)
#ifndef BIG_SIZE
# define BIG_SIZE (1<<16) /* 64K */
@@ -214,9 +214,9 @@ emergency_sbrk(size)
return (char *)-1; /* poor guy... */
}
-#else /* !PERL_EMERGENCY_SBRK */
+#else /* !(defined(TWO_POT_OPTIMIZE) && defined(PERL_CORE)) */
# define emergency_sbrk(size) -1
-#endif /* !PERL_EMERGENCY_SBRK */
+#endif /* !(defined(TWO_POT_OPTIMIZE) && defined(PERL_CORE)) */
/*
* nextf[i] is the pointer to the next free block of size 2^(i+3). The
@@ -753,10 +753,10 @@ dump_mstats(s)
# endif
# ifdef PERL_SBRK_VIA_MALLOC
-# ifdef HIDEMYMALLOC
+# if defined(HIDEMYMALLOC) || defined(EMBEDMYMALLOC)
# undef malloc
# else
-# include "Error: -DPERL_SBRK_VIA_MALLOC requires -DHIDEMYMALLOC"
+# include "Error: -DPERL_SBRK_VIA_MALLOC needs -D(HIDE|EMBED)MYMALLOC"
# endif
/* it may seem schizophrenic to use perl's malloc and let it call system */