Commit a79177f5 by Jeffrey A Law Committed by Jeff Law

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
parent 1e467e19
Thu Sep 18 17:31:38 1997 Jeffrey A Law (law@cygnus.com) 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 * g77install.texi: Renamed from install.texi
* g77.texi: Corresponding changes. * g77.texi: Corresponding changes.
......
...@@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <ctype.h> #include <ctype.h>
#include "glimits.j" #include "glimits.j"
#if !FFEPROJ_STRTOUL #ifndef HAVE_STRTOUL
unsigned long int unsigned long int
strtoul (const char *nptr, char **endptr, int base) strtoul (const char *nptr, char **endptr, int base)
{ {
...@@ -43,10 +43,9 @@ strtoul (const char *nptr, char **endptr, int base) ...@@ -43,10 +43,9 @@ strtoul (const char *nptr, char **endptr, int base)
return number; return number;
} }
#endif #endif
#if !FFEPROJ_BSEARCH #ifndef HAVE_BSEARCH
void * void *
bsearch (const void *key, const void *base, size_t nmemb, size_t size, bsearch (const void *key, const void *base, size_t nmemb, size_t size,
int (*compar) (const void *, const void *)) int (*compar) (const void *, const void *))
...@@ -67,5 +66,4 @@ bsearch (const void *key, const void *base, size_t nmemb, size_t size, ...@@ -67,5 +66,4 @@ bsearch (const void *key, const void *base, size_t nmemb, size_t size,
return NULL; return NULL;
} }
#endif #endif
...@@ -43,24 +43,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA ...@@ -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 simply remove all but the simplest and most useful code (which is
still in proj.c). still in proj.c).
So, if you find your system can't link because bsearch() or strtoul() XXX Not entirely true anymore. We do want to cater to broken systems
aren't found, please just fix your system, or hand-edit the code again by using autoconf to handle the braindamage for us. */
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
/* Include files everyone gets. */ /* Include files everyone gets. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment