From 8266e478d66f551e471e94a25de35db9f8f5e4c0 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Fri, 20 Jun 2003 23:57:48 +0000
Subject: 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.
---
 newlib/libc/sys/linux/intl/Makefile.am | 2 +-
 newlib/libc/sys/linux/intl/Makefile.in | 4 +++-
 newlib/libc/sys/linux/intl/config.h    | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'newlib/libc/sys/linux/intl')

diff --git a/newlib/libc/sys/linux/intl/Makefile.am b/newlib/libc/sys/linux/intl/Makefile.am
index ec1021793..e484b2b53 100644
--- a/newlib/libc/sys/linux/intl/Makefile.am
+++ b/newlib/libc/sys/linux/intl/Makefile.am
@@ -27,7 +27,7 @@ endif # USE_LIBTOOL
 
 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
diff --git a/newlib/libc/sys/linux/intl/Makefile.in b/newlib/libc/sys/linux/intl/Makefile.in
index 8cbf52b6f..62ab58425 100644
--- a/newlib/libc/sys/linux/intl/Makefile.in
+++ b/newlib/libc/sys/linux/intl/Makefile.in
@@ -73,6 +73,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
+EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
+EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
@@ -117,7 +119,7 @@ msgcatdir = /usr/share/locale
 @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
diff --git a/newlib/libc/sys/linux/intl/config.h b/newlib/libc/sys/linux/intl/config.h
index 010de6079..69de0abcb 100644
--- a/newlib/libc/sys/linux/intl/config.h
+++ b/newlib/libc/sys/linux/intl/config.h
@@ -24,3 +24,6 @@
 #define UINT32_C(c)    c ## U
 
 #include <machine/sysdep.h>
+#include <features.h>
+
+#define _LIBC 1
-- 
cgit v1.2.3