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_strchr.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_strchr.U')
-rw-r--r-- | mcon/U/d_strchr.U | 70 |
1 files changed, 31 insertions, 39 deletions
diff --git a/mcon/U/d_strchr.U b/mcon/U/d_strchr.U index 3946510..310b137 100644 --- a/mcon/U/d_strchr.U +++ b/mcon/U/d_strchr.U @@ -1,11 +1,11 @@ -?RCS: $Id: d_strchr.U 1 2006-08-24 12:32:52Z rmanfredi $ +?RCS: $Id: d_strchr.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_strchr.U,v $ @@ -19,7 +19,7 @@ ?RCS: Revision 3.0 1993/08/18 12:07:32 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_strchr d_index: contains strings Setvar Myread Oldconfig Csym +?MAKE:d_strchr d_index: Trylink cat ?MAKE: -pick add $@ %< ?S:d_strchr: ?S: This variable conditionally defines HAS_STRCHR if strchr() and @@ -55,41 +55,33 @@ ?M:#endif ?M:#endif ?M:. -?T:vali ?LINT:set d_strchr d_index : index or strchr -echo " " -if set index val -f; eval $csym; $val; then - if set strchr val -f d_strchr; eval $csym; $val; then - if $contains strchr "$strings" >/dev/null 2>&1 ; then -?X: has index, strchr, and strchr in string header - val="$define" - vali="$undef" - echo "strchr() found." >&4 - else -?X: has index, strchr, and no strchr in string header - val="$undef" - vali="$define" - echo "index() found." >&4 - fi - else -?X: has only index, no strchr, string header is a moot point - val="$undef" - vali="$define" - echo "index() found." >&4 - fi -else - if set strchr val -f d_strchr; eval $csym; $val; then - val="$define" - vali="$undef" - echo "strchr() found." >&4 - else - echo "No index() or strchr() found!" >&4 - val="$undef" - vali="$undef" - fi -fi -set d_strchr; eval $setvar -val="$vali" -set d_index; eval $setvar +$cat >try.c <<EOC +#include <string.h> +int main(void) +{ + static char ret; + static int c; + ret |= *strchr("string", c); + return ret ? 0 : 1; +} +EOC +cyn=strchr +set d_strchr +eval $trylink + +$cat >try.c <<EOC +#include <strings.h> +int main(void) +{ + static char ret; + static int c; + ret |= *index("string", c); + return ret ? 0 : 1; +} +EOC +cyn=index +set d_index +eval $trylink |