* Makefile.am: Fix space vs. tab problem in install-data-local.

* Makefile.in: Regenerate.
* libc/include/_ansi.h (_EXFUN): Define specially for __CYGWIN__.
(_EXPARM): New macro for defining a function parameter.
* libc/include/stdlib.h: Use _EXPARM.
* libc/stdlib/mallocr.c: Don't build cfree for Cygwin.
This commit is contained in:
Christopher Faylor 2000-09-06 20:46:27 +00:00
parent b16bb9f718
commit a385ae7508
6 changed files with 41 additions and 22 deletions

View File

@ -1,3 +1,15 @@
Wed Sep 6 15:06:40 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.am: Fix space vs. tab problem in install-data-local.
* Makefile.in: Regenerate.
Wed Sep 6 13:49:51 2000 Christopher Faylor <cgf@cygnus.com>
* libc/include/_ansi.h (_EXFUN): Define specially for __CYGWIN__.
(_EXPARM): New macro for defining a function parameter.
* libc/include/stdlib.h: Use _EXPARM.
* libc/stdlib/mallocr.c: Don't build cfree for Cygwin.
2000-09-05 Manfred Hollstein <manfredh@redhat.com> 2000-09-05 Manfred Hollstein <manfredh@redhat.com>
* Makefile.am (install-data-local): Use optional $(DESTDIR) where * Makefile.am (install-data-local): Use optional $(DESTDIR) where

View File

@ -128,33 +128,33 @@ stmp-targ-include: config.status
CLEANFILES = targ-include stmp-targ-include CLEANFILES = targ-include stmp-targ-include
install-data-local: install-toollibLIBRARIES install-data-local: install-toollibLIBRARIES
rm -f $(DESTDIR)$(toollibdir)/libg.a rm -f $(DESTDIR)$(toollibdir)/libg.a
ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
-if [ -z "$(MULTISUBDIR)" ]; then \ -if [ -z "$(MULTISUBDIR)" ]; then \
for i in $(srcdir)/libc/include/*.h; do \ for i in $(srcdir)/libc/include/*.h; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/include/machine/*.h; do \ for i in $(srcdir)/libc/include/machine/*.h; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done; \ done; \
for i in $(srcdir)/libc/include/sys/*.h; do \ for i in $(srcdir)/libc/include/sys/*.h; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \ for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done ; \ done ; \
for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \ for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done ; \ done ; \
else true; fi else true; fi

View File

@ -126,7 +126,8 @@ AM_MAKEFLAGS = \
"DESTDIR=$(DESTDIR)" "DESTDIR=$(DESTDIR)"
@HAVE_DOC_TRUE@DOCDIR = @HAVE_DOC_TRUE@doc @HAVE_DOC_TRUE@DOCDIR = \
@HAVE_DOC_TRUE@doc
SUBDIRS = libc libm $(DOCDIR) . SUBDIRS = libc libm $(DOCDIR) .
@ -408,7 +409,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \ cp -pr $$/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@ -561,33 +562,33 @@ stmp-targ-include: config.status
done done
touch $@ touch $@
install-data-local: install-toollibLIBRARIES install-data-local: install-toollibLIBRARIES
rm -f $(DESTDIR)$(toollibdir)/libg.a rm -f $(DESTDIR)$(toollibdir)/libg.a
ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
-if [ -z "$(MULTISUBDIR)" ]; then \ -if [ -z "$(MULTISUBDIR)" ]; then \
for i in $(srcdir)/libc/include/*.h; do \ for i in $(srcdir)/libc/include/*.h; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/include/machine/*.h; do \ for i in $(srcdir)/libc/include/machine/*.h; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done; \ done; \
for i in $(srcdir)/libc/include/sys/*.h; do \ for i in $(srcdir)/libc/include/sys/*.h; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \ for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done ; \ done ; \
for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \ for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done ; \ done ; \
else true; fi else true; fi

View File

@ -31,7 +31,13 @@
#define _SIGNED signed #define _SIGNED signed
#define _DOTS , ... #define _DOTS , ...
#define _VOID void #define _VOID void
#ifdef __CYGWIN__
#define _EXFUN(name, proto) __cdecl name proto
#define _EXPARM(name, proto) (* __cdecl name) proto
#else
#define _EXFUN(name, proto) name proto #define _EXFUN(name, proto) name proto
#define _EXPARM(name, proto) (* name) proto
#endif
#define _DEFUN(name, arglist, args) name(args) #define _DEFUN(name, arglist, args) name(args)
#define _DEFUN_VOID(name) name(_NOARGS) #define _DEFUN_VOID(name) name(_NOARGS)
#define _CAST_VOID (void) #define _CAST_VOID (void)

View File

@ -56,7 +56,7 @@ _PTR _EXFUN(bsearch,(const _PTR __key,
const _PTR __base, const _PTR __base,
size_t __nmemb, size_t __nmemb,
size_t __size, size_t __size,
int _EXFUN((*_compar),(const _PTR, const _PTR)))); int _EXPARM(_compar,(const _PTR, const _PTR))));
_PTR _EXFUN(calloc,(size_t __nmemb, size_t __size)); _PTR _EXFUN(calloc,(size_t __nmemb, size_t __size));
div_t _EXFUN(div,(int __numer, int __denom)); div_t _EXFUN(div,(int __numer, int __denom));
_VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn))); _VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn)));

View File

@ -3198,7 +3198,7 @@ Void_t* cALLOc(RARG n, elem_size) RDECL size_t n; size_t elem_size;
#endif /* DEFINE_CALLOC */ #endif /* DEFINE_CALLOC */
#ifdef DEFINE_CFREE #if defined(DEFINE_CFREE) && !defined(__CYGWIN__)
/* /*