diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
| commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
| tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /driver/Configuration.mli | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'driver/Configuration.mli')
| -rw-r--r-- | driver/Configuration.mli | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/driver/Configuration.mli b/driver/Configuration.mli index f82ce213..1d048ac4 100644 --- a/driver/Configuration.mli +++ b/driver/Configuration.mli @@ -46,7 +46,7 @@ type struct_return_style = | SR_int1248 (* return by content if size is 1, 2, 4 or 8 bytes *) | SR_int1to4 (* return by content if size is <= 4 *) | SR_int1to8 (* return by content if size is <= 8 *) - | SR_ref (* always return by assignment to a reference + | SR_ref (* always return by assignment to a reference given as extra argument *) val struct_passing_style: struct_passing_style |