summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Weis <Pierre.Weis@inria.fr>2000-02-14 14:30:40 +0000
committerPierre Weis <Pierre.Weis@inria.fr>2000-02-14 14:30:40 +0000
commit3b460278e0f93699a8bee986047e274471c9499e (patch)
treeeed37dca83558f9b80339f8408e7a7c5f2ac44cf
parent2429f44a3bb5532cd89fbfdfff257ebc0f49088d (diff)
downloadocaml-3b460278e0f93699a8bee986047e274471c9499e.tar.gz
Correction d'un pb d'include
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2815 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--byterun/extern.c9
-rw-r--r--byterun/finalise.h2
-rw-r--r--byterun/roots.c1
-rw-r--r--byterun/roots.h2
4 files changed, 9 insertions, 5 deletions
diff --git a/byterun/extern.c b/byterun/extern.c
index 79c10491dd..02fe74ffef 100644
--- a/byterun/extern.c
+++ b/byterun/extern.c
@@ -508,7 +508,8 @@ void serialize_block_1(void * data, long len)
void serialize_block_2(void * data, long len)
{
- unsigned char * p, * q;
+ unsigned char * p;
+ char * q;
if (extern_ptr + 2 * len > extern_limit) resize_extern_block(2 * len);
#ifndef ARCH_BIG_ENDIAN
for (p = data, q = extern_ptr; len > 0; len--, p += 2, q += 2)
@@ -522,7 +523,8 @@ void serialize_block_2(void * data, long len)
void serialize_block_4(void * data, long len)
{
- unsigned char * p, * q;
+ unsigned char * p;
+ char * q;
if (extern_ptr + 4 * len > extern_limit) resize_extern_block(4 * len);
#ifndef ARCH_BIG_ENDIAN
for (p = data, q = extern_ptr; len > 0; len--, p += 4, q += 4)
@@ -536,7 +538,8 @@ void serialize_block_4(void * data, long len)
void serialize_block_8(void * data, long len)
{
- unsigned char * p, * q;
+ unsigned char * p;
+ char * q;
if (extern_ptr + 8 * len > extern_limit) resize_extern_block(8 * len);
#ifndef ARCH_BIG_ENDIAN
for (p = data, q = extern_ptr; len > 0; len--, p += 8, q += 8)
diff --git a/byterun/finalise.h b/byterun/finalise.h
index e0f7c88073..41ce09d5c7 100644
--- a/byterun/finalise.h
+++ b/byterun/finalise.h
@@ -19,5 +19,5 @@ void final_do_calls (void);
void final_do_strong_roots (scanning_action f);
void final_do_weak_roots (scanning_action f);
void final_do_young_roots (scanning_action f);
-void final_minor_gc_done (void);
+void final_empty_young (void);
value final_register (value f, value v);
diff --git a/byterun/roots.c b/byterun/roots.c
index 9235b843d7..eb7c0e973c 100644
--- a/byterun/roots.c
+++ b/byterun/roots.c
@@ -14,6 +14,7 @@
/* To walk the memory roots for garbage collection */
+#include "finalise.h"
#include "major_gc.h"
#include "memory.h"
#include "minor_gc.h"
diff --git a/byterun/roots.h b/byterun/roots.h
index b8ce028ddf..99240d6c5f 100644
--- a/byterun/roots.h
+++ b/byterun/roots.h
@@ -20,7 +20,7 @@
typedef void (*scanning_action) (value, value *);
-void oldify_young_roots (void);
+void oldify_local_roots (void);
void darken_all_roots (void);
void do_roots (scanning_action);
#ifndef NATIVE_CODE