This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

intl patches (3)



This makes it possible to #include "gettextP.h" by itself, without getting
errors about undefined size_t or nls_uint32 types.

This patch doesn't cause behaviour changes in glibc.


2001-03-17  Bruno Haible  <haible@clisp.cons.org>

	* intl/gettextP.h: Include <stddef.h>. Include gettext.h, for
	nls_uint32.
	* intl/bindtextdom.c: Don't include gettext.h.
	* intl/dcgettext.c: Likewise.
	* intl/dcigettext.c: Likewise.
	* intl/dcngettext.c: Likewise.
	* intl/dngettext.c: Likewise.
	* intl/finddomain.c: Likewise.
	* intl/localealias.c: Likewise.
	* intl/ngettext.c: Likewise.
	* intl/plural.y: Likewise.
	* intl/textdomain.c: Likewise.

diff -r -c3 intl/gettextP.h intl/gettextP.h
*** intl/gettextP.h	Thu May  4 12:53:41 2000
--- intl/gettextP.h	Sat Mar 17 17:06:11 2001
***************
*** 1,5 ****
! /* Header describing internals of gettext library
!    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
     Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
  
     The GNU C Library is free software; you can redistribute it and/or
--- 1,5 ----
! /* Header describing internals of libintl library.
!    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
     Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
  
     The GNU C Library is free software; you can redistribute it and/or
***************
*** 20,25 ****
--- 20,27 ----
  #ifndef _GETTEXTP_H
  #define _GETTEXTP_H
  
+ #include <stddef.h>		/* Get size_t.  */
+ 
  #ifdef _LIBC
  # include "../iconv/gconv_int.h"
  #else
***************
*** 30,35 ****
--- 32,39 ----
  
  #include "loadinfo.h"
  
+ #include "gettext.h"		/* Get nls_uint32.  */
+ 
  /* @@ end of prolog @@ */
  
  #ifndef PARAMS
diff -r -c3 intl/bindtextdom.c intl/bindtextdom.c
*** intl/bindtextdom.c	Fri Jan  5 15:10:57 2001
--- intl/bindtextdom.c	Sat Mar 17 17:06:11 2001
***************
*** 1,5 ****
  /* Implementation of the bindtextdomain(3) function
!    Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
--- 1,5 ----
  /* Implementation of the bindtextdomain(3) function
!    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
***************
*** 44,50 ****
  #else
  # include "libgettext.h"
  #endif
- #include "gettext.h"
  #include "gettextP.h"
  
  #ifdef _LIBC
--- 44,49 ----
diff -r -c3 intl/dcgettext.c intl/dcgettext.c
*** intl/dcgettext.c	Mon Feb 28 11:34:03 2000
--- intl/dcgettext.c	Sat Mar 17 17:06:11 2001
***************
*** 1,5 ****
  /* Implementation of the dcgettext(3) function.
!    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
--- 1,5 ----
  /* Implementation of the dcgettext(3) function.
!    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
***************
*** 20,26 ****
  # include <config.h>
  #endif
  
- #include "gettext.h"
  #include "gettextP.h"
  #ifdef _LIBC
  # include <libintl.h>
--- 20,25 ----
diff -r -c3 intl/dcigettext.c intl/dcigettext.c
*** intl/dcigettext.c	Sat Mar 17 17:00:18 2001
--- intl/dcigettext.c	Sat Mar 17 17:06:11 2001
***************
*** 89,95 ****
  # include <sys/param.h>
  #endif
  
- #include "gettext.h"
  #include "gettextP.h"
  #ifdef _LIBC
  # include <libintl.h>
--- 89,94 ----
diff -r -c3 intl/dcngettext.c intl/dcngettext.c
*** intl/dcngettext.c	Mon Feb 28 11:34:04 2000
--- intl/dcngettext.c	Sat Mar 17 17:06:11 2001
***************
*** 1,5 ****
  /* Implementation of the dcngettext(3) function.
!    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
--- 1,5 ----
  /* Implementation of the dcngettext(3) function.
!    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
***************
*** 20,26 ****
  # include <config.h>
  #endif
  
- #include "gettext.h"
  #include "gettextP.h"
  #ifdef _LIBC
  # include <libintl.h>
--- 20,25 ----
diff -r -c3 intl/dngettext.c intl/dngettext.c
*** intl/dngettext.c	Mon Feb 28 11:34:04 2000
--- intl/dngettext.c	Sat Mar 17 17:06:11 2001
***************
*** 1,5 ****
  /* Implementation of the dngettext(3) function.
!    Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
--- 1,5 ----
  /* Implementation of the dngettext(3) function.
!    Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
***************
*** 24,30 ****
  # include <locale.h>
  #endif
  
- #include "gettext.h"
  #include "gettextP.h"
  #ifdef _LIBC
  # include <libintl.h>
--- 24,29 ----
diff -r -c3 intl/finddomain.c intl/finddomain.c
*** intl/finddomain.c	Fri Jan  5 15:10:57 2001
--- intl/finddomain.c	Sat Mar 17 17:06:11 2001
***************
*** 1,5 ****
  /* Handle list of needed message catalogs
!    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
     Written by Ulrich Drepper <drepper@gnu.org>, 1995.
  
     The GNU C Library is free software; you can redistribute it and/or
--- 1,5 ----
  /* Handle list of needed message catalogs
!    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
     Written by Ulrich Drepper <drepper@gnu.org>, 1995.
  
     The GNU C Library is free software; you can redistribute it and/or
***************
*** 47,53 ****
  # include <unistd.h>
  #endif
  
- #include "gettext.h"
  #include "gettextP.h"
  #ifdef _LIBC
  # include <libintl.h>
--- 47,52 ----
diff -r -c3 intl/localealias.c intl/localealias.c
*** intl/localealias.c	Fri Jan  5 15:10:57 2001
--- intl/localealias.c	Sat Mar 17 17:06:11 2001
***************
*** 1,5 ****
  /* Handle aliases for locale names.
!    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
--- 1,5 ----
  /* Handle aliases for locale names.
!    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
***************
*** 73,79 ****
  # endif
  #endif
  
- #include "gettext.h"
  #include "gettextP.h"
  
  /* @@ end of prolog @@ */
--- 73,78 ----
diff -r -c3 intl/ngettext.c intl/ngettext.c
*** intl/ngettext.c	Thu Apr 27 13:14:45 2000
--- intl/ngettext.c	Sat Mar 17 17:06:11 2001
***************
*** 1,5 ****
  /* Implementation of ngettext(3) function.
!    Copyright (C) 1995, 1997, 2000 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
--- 1,5 ----
  /* Implementation of ngettext(3) function.
!    Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
***************
*** 35,41 ****
  # endif
  #endif
  
- #include "gettext.h"
  #include "gettextP.h"
  #ifdef _LIBC
  # include <libintl.h>
--- 35,40 ----
diff -r -c3 intl/plural.y intl/plural.y
*** intl/plural.y	Fri Jan  5 15:10:57 2001
--- intl/plural.y	Sat Mar 17 17:12:55 2001
***************
*** 24,30 ****
  
  #include <stdarg.h>
  #include <stdlib.h>
- #include "gettext.h"
  #include "gettextP.h"
  
  #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
--- 24,29 ----
diff -r -c3 intl/textdomain.c intl/textdomain.c
*** intl/textdomain.c	Fri Jan  5 15:10:57 2001
--- intl/textdomain.c	Sat Mar 17 17:12:46 2001
***************
*** 1,5 ****
  /* Implementation of the textdomain(3) function.
!    Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
--- 1,5 ----
  /* Implementation of the textdomain(3) function.
!    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
  
     The GNU C Library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public License as
***************
*** 38,44 ****
  #else
  # include "libgettext.h"
  #endif
- #include "gettext.h"
  #include "gettextP.h"
  
  #ifdef _LIBC
--- 38,43 ----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]