diff options
author | Luc Maranget <luc.maranget@inria.fr> | 2014-03-13 15:03:16 +0000 |
---|---|---|
committer | Luc Maranget <luc.maranget@inria.fr> | 2014-03-13 15:03:16 +0000 |
commit | 1338d73c180d22cd2fd2abc5b46554a56f66b1f5 (patch) | |
tree | 1d7171e373a49abdbac5bc790f896aadbca27718 /byterun/misc.h | |
parent | 18e6a3781be059367bfff403aa8a41e9dc200844 (diff) | |
download | ocaml-jo401.tar.gz |
Merge jo401 w.r.t ocaml/4.01 from 13776 to 14115jo401
Plus ld.conf changes
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/jo401@14458 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/misc.h')
-rw-r--r-- | byterun/misc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/byterun/misc.h b/byterun/misc.h index 2529bc6128..4fd82af2d1 100644 --- a/byterun/misc.h +++ b/byterun/misc.h @@ -51,6 +51,14 @@ typedef char * addr; #define CAMLprim #define CAMLextern extern +/* Weak function definitions that can be overriden by external libs */ +/* Conservatively restricted to ELF and MacOSX platforms */ +#if defined(__GNUC__) && (defined (__ELF__) || defined(__APPLE__)) +#define CAMLweakdef __attribute__((weak)) +#else +#define CAMLweakdef +#endif + /* Assertions */ /* <private> */ |