diff options
| author | Jeffrey A Law <law@cygnus.com> | 1997-09-19 05:16:54 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1997-09-18 23:16:54 -0600 |
| commit | a79177f5a16af4774fd957456e5d07699ecff531 (patch) | |
| tree | 85645bba1f9b79b0a2b6f79d10eac983e1e535c9 | |
| parent | 1e467e19b0508047b44226def6d157f8864c0dfc (diff) | |
| download | gcc-a79177f5a16af4774fd957456e5d07699ecff531.zip gcc-a79177f5a16af4774fd957456e5d07699ecff531.tar.gz gcc-a79177f5a16af4774fd957456e5d07699ecff531.tar.bz2 | |
proj.h (FFEPROJ_BSEARCH): Delete all references.
* proj.h (FFEPROJ_BSEARCH): Delete all references.
(FFEPROJ_STRTOUL): Likewise.
* proj.c (bsearch): Compile this if no bsearch is provided by the
host system.
(strtoul): Similarly.
From-SVN: r15561
| -rw-r--r-- | gcc/f/ChangeLog.egcs | 6 | ||||
| -rw-r--r-- | gcc/f/proj.c | 6 | ||||
| -rw-r--r-- | gcc/f/proj.h | 20 |
3 files changed, 10 insertions, 22 deletions
diff --git a/gcc/f/ChangeLog.egcs b/gcc/f/ChangeLog.egcs index 7c1e265..364e0af 100644 --- a/gcc/f/ChangeLog.egcs +++ b/gcc/f/ChangeLog.egcs @@ -1,5 +1,11 @@ Thu Sep 18 17:31:38 1997 Jeffrey A Law (law@cygnus.com) + * proj.h (FFEPROJ_BSEARCH): Delete all references. + (FFEPROJ_STRTOUL): Likewise. + * proj.c (bsearch): Compile this if no bsearch is provided by the + host system. + (strtoul): Similarly. + * g77install.texi: Renamed from install.texi * g77.texi: Corresponding changes. diff --git a/gcc/f/proj.c b/gcc/f/proj.c index 0e1ef2e..78fcc45 100644 --- a/gcc/f/proj.c +++ b/gcc/f/proj.c @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include <ctype.h> #include "glimits.j" -#if !FFEPROJ_STRTOUL +#ifndef HAVE_STRTOUL unsigned long int strtoul (const char *nptr, char **endptr, int base) { @@ -43,10 +43,9 @@ strtoul (const char *nptr, char **endptr, int base) return number; } - #endif -#if !FFEPROJ_BSEARCH +#ifndef HAVE_BSEARCH void * bsearch (const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *)) @@ -67,5 +66,4 @@ bsearch (const void *key, const void *base, size_t nmemb, size_t size, return NULL; } - #endif diff --git a/gcc/f/proj.h b/gcc/f/proj.h index 0446070..d05b1c3 100644 --- a/gcc/f/proj.h +++ b/gcc/f/proj.h @@ -43,24 +43,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA simply remove all but the simplest and most useful code (which is still in proj.c). - So, if you find your system can't link because bsearch() or strtoul() - aren't found, please just fix your system, or hand-edit the code - below as appropriate. I DO NOT WANT ANY "BUG REPORTS" ABOUT THIS. - g77 requires a working ANSI C environment, and if bsearch() and strtoul() - do not exist, or if <assert.h> isn't found, etc., then you don't have - one, and it is not g77's fault. If it turns out g77 is simply - referring to the wrong system header file -- something I can verify - myself using my copy of the ANSI C standard -- I would like to know - about that. Otherwise, g77 is not the place to fix problems with your - ANSI C implementation, though perhaps gcc might be. - -- burley@gnu.ai.mit.edu 1995-03-24 */ - -#ifndef FFEPROJ_BSEARCH -#define FFEPROJ_BSEARCH 1 /* 0=>use slow code in proj.c. */ -#endif -#ifndef FFEPROJ_STRTOUL -#define FFEPROJ_STRTOUL 1 /* 0=>use untested code in proj.c. */ -#endif + XXX Not entirely true anymore. We do want to cater to broken systems + again by using autoconf to handle the braindamage for us. */ /* Include files everyone gets. */ |