+2003-06-20 Jeff Johnston <jjohnstn@redhat.com>
+
+ * libc/include/sys/reent.h (_REENT_INIT_PTR): Fix macros
+ to handle latest on_exit change.
+ * libc/sys/linux/Makefile.am: Remove special compilation
+ for malloc.c and mcheck.c.
+ * libc/sys/linux/Makefile.in: Regenerated.
+ * libc/sys/linux/mntent.c: Add definition of _LIBC flag
+ after including <features.h>.
+ * libc/sys/linux/mcheck.c: Ditto.
+ * libc/sys/linux/malloc.c: Ditto plus define _GNU_SOURCE
+ for <features.h>.
+ * libc/sys/linux/intl/Makefile.am: Remove -D_LIBC and
+ add -DNOT_IN_libc to C flags.
+ * libc/sys/linux/intl/Makefile.in: Regenerated.
+ * libc/sys/linux/intl/config.h: Add definition of _LIBC.
+ * libc/sys/linux/linuxthreads/semaphore.h: Include
+ <bits/pthreadtypes.h>.
+ * libc/sys/linux/sys/dirent.h: Define _LIBC and NOT_IN_libc after
+ including <features.h>.
+ * libc/sys/linux/sys/lock.h: Ditto.
+
2003-06-11 Nick Clifton <nickc@redhat.com>
* libc/reent/reent.c (reclaim_reent): Fix typo in code to free
var->_sig_func = _NULL; \
var->_atexit._ind = 0; \
var->_atexit._fns[0] = _NULL; \
- var->_atexit._fnargs[0] = _NULL; \
- var->_atexit._fntypes = 0; \
+ var->_atexit._on_exit_args = _NULL; \
var->__sglue._next = _NULL; \
var->__sglue._niobs = 0; \
var->__sglue._iobs = _NULL; \
var->_atexit = _NULL; \
var->_atexit0._ind = 0; \
var->_atexit0._fns[0] = _NULL; \
- var->_atexit0._fntypes = 0; \
+ var->_atexit0._on_exit_args._fntypes = 0; \
+ var->_atexit0._on_exit_args._fnargs[0] = _NULL; \
var->_sig_func = _NULL; \
var->__sglue._next = _NULL; \
var->__sglue._niobs = 0; \
machine/crt0.o: ; @true
-malloc.$(oext): $(srcdir)/malloc.c
- $(LIBC_COMPILE) -D_LIBC=1 -c $< -o $@
-
-mcheck.$(oext): $(srcdir)/mcheck.c
- $(LIBC_COMPILE) -D_LIBC=1 -c $< -o $@
-
sig.$(oext): siglist.inc
siglist.inc:
machine/crt0.o: ; @true
-malloc.$(oext): $(srcdir)/malloc.c
- $(LIBC_COMPILE) -D_LIBC=1 -c $< -o $@
-
-mcheck.$(oext): $(srcdir)/mcheck.c
- $(LIBC_COMPILE) -D_LIBC=1 -c $< -o $@
-
sig.$(oext): siglist.inc
siglist.inc:
include $(srcdir)/../../../../Makefile.shared
-AM_CFLAGS = -D_LIBC -DHAVE_CONFIG_H -D_GNU_SOURCE -D__libc_enable_secure=1 -D'LOCALEDIR="$(msgcatdir)"' -D'LOCALE_ALIAS_PATH="$(msgcatdir)"' -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
+AM_CFLAGS = -DNOT_IN_libc -DHAVE_CONFIG_H -D_GNU_SOURCE -D__libc_enable_secure=1 -D'LOCALEDIR="$(msgcatdir)"' -D'LOCALE_ALIAS_PATH="$(msgcatdir)"' -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
# shouldn't have to do the following, but if needed
BISONFLAGS = --yacc --name-prefix=__gettext --output
CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@
EXEEXT = @EXEEXT@
+EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
+EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
LDFLAGS = @LDFLAGS@
@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
-AM_CFLAGS = -D_LIBC -DHAVE_CONFIG_H -D_GNU_SOURCE -D__libc_enable_secure=1 -D'LOCALEDIR="$(msgcatdir)"' -D'LOCALE_ALIAS_PATH="$(msgcatdir)"' -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
+AM_CFLAGS = -DNOT_IN_libc -DHAVE_CONFIG_H -D_GNU_SOURCE -D__libc_enable_secure=1 -D'LOCALEDIR="$(msgcatdir)"' -D'LOCALE_ALIAS_PATH="$(msgcatdir)"' -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
# shouldn't have to do the following, but if needed
BISONFLAGS = --yacc --name-prefix=__gettext --output
#define UINT32_C(c) c ## U
#include <machine/sysdep.h>
+#include <features.h>
+
+#define _LIBC 1
#include <features.h>
#include <sys/types.h>
+#include <bits/pthreadtypes.h>
#ifdef __USE_XOPEN2K
# define __need_timespec
# include <time.h>
#endif
#endif /*Void_t*/
+#define _GNU_SOURCE
+#include <features.h>
+#define _LIBC 1
+#define NOT_IN_libc 1
+
#if __STD_C
# include <stddef.h> /* for size_t */
# if defined _LIBC || defined MALLOC_HOOKS
#ifndef _MALLOC_INTERNAL
# define _MALLOC_INTERNAL
+# include <features.h>
+# define _LIBC 1
# include <malloc.h>
# include <mcheck.h>
# include <stdint.h>
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <features.h>
#include <mntent.h>
#include <stdlib.h>
#include <libc-symbols.h>
+#define _LIBC 1
+#define NOT_IN_libc 1
#include <bits/libc-lock.h>
/* We don't want to allocate the static buffer all the time since it
#include <sys/types.h>
#include <linux/dirent.h>
#define _LIBC 1
+#define NOT_IN_libc 1
#include <sys/lock.h>
#undef _LIBC
#define __SYS_LOCK_H__
#include <machine/weakalias.h>
+#include <features.h>
+
+#define _LIBC 1
+#define NOT_IN_libc 1
-#define _LIBC 1
#include <bits/libc-lock.h>
typedef __libc_lock_t _LOCK_T;