diff options
author | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-27 18:05:39 -0700 |
---|---|---|
committer | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-27 18:05:39 -0700 |
commit | 7d4c02d5c9108aa413fbb0ffa1dc8a39bc5f54a1 (patch) | |
tree | 2abb9ad01d397bc1e208f57f528c1ec529761392 /mcon/U/d_volatile.U | |
parent | 5c913c35c09a82eead2c07534baa709a5dead3e7 (diff) | |
parent | 8f5e5726134ce5b4bd436b16f367796d851df553 (diff) |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
Conflicts:
jmake/jmake.man
Diffstat (limited to 'mcon/U/d_volatile.U')
-rw-r--r-- | mcon/U/d_volatile.U | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/mcon/U/d_volatile.U b/mcon/U/d_volatile.U index a50a257..bf31302 100644 --- a/mcon/U/d_volatile.U +++ b/mcon/U/d_volatile.U @@ -1,11 +1,11 @@ -?RCS: $Id: d_volatile.U 1 2006-08-24 12:32:52Z rmanfredi $ +?RCS: $Id: d_volatile.U 167 2013-05-08 17:58:00Z rmanfredi $ ?RCS: ?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: -?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: You may redistribute only under the terms of the Artistic License, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of -?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: that same Artistic License; a copy of which may be found at the root ?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: d_volatile.U,v $ @@ -41,7 +41,7 @@ echo " " echo 'Checking to see if your C compiler knows about "volatile"...' >&4 $cat >try.c <<'EOCP' -int main() +int main(void) { ?X: ?X: The following seven lines added by Bill Campbell <billc@sierra.com> @@ -55,13 +55,18 @@ int main() char char_var; }; typedef unsigned short foo_t; - char *volatile foo; - volatile int bar; - volatile foo_t blech; + static char *volatile foo; + static volatile int bar; + static volatile foo_t blech; foo = foo; + (void) goo; + (void) foo; + (void) bar; + (void) blech; + return 0; } EOCP -if $cc -c $ccflags try.c >/dev/null 2>&1 ; then +if $cc -c $ccflags try.c; then val="$define" echo "Yup, it does." else |