diff options
| author | Simon Josefsson <simon@josefsson.org> | 2006-10-30 08:41:37 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2006-10-30 08:41:37 +0000 |
| commit | 7df5419da539d9caf81727902fca00b73c0e2d9f (patch) | |
| tree | 953f1ac1bc32081ebc1894f802efd3f67cf671d3 /gl | |
| parent | efa0d800987baa5e7a921e94e93b08bdbc268950 (diff) | |
| download | gnutls-7df5419da539d9caf81727902fca00b73c0e2d9f.tar.gz | |
Update.
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/getaddrinfo.c | 7 | ||||
| -rw-r--r-- | gl/getdelim.c | 6 | ||||
| -rw-r--r-- | gl/getline.c | 6 | ||||
| -rw-r--r-- | gl/gettext.h | 2 | ||||
| -rw-r--r-- | gl/m4/lib-link.m4 | 2 | ||||
| -rw-r--r-- | gl/readline.c | 4 |
6 files changed, 10 insertions, 17 deletions
diff --git a/gl/getaddrinfo.c b/gl/getaddrinfo.c index 333ad3b3d2..358214afec 100644 --- a/gl/getaddrinfo.c +++ b/gl/getaddrinfo.c @@ -1,5 +1,6 @@ /* Get address information (partial implementation). - Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006 Free Software + Foundation, Inc. Contributed by Simon Josefsson <simon@josefsson.org>. This program is free software; you can redistribute it and/or modify @@ -16,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "getaddrinfo.h" diff --git a/gl/getdelim.c b/gl/getdelim.c index a131b0c632..e0b8a708ba 100644 --- a/gl/getdelim.c +++ b/gl/getdelim.c @@ -1,5 +1,5 @@ /* getdelim.c --- Implementation of replacement getdelim function. - Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005 Free + Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or @@ -19,9 +19,7 @@ /* Ported from glibc by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "getdelim.h" diff --git a/gl/getline.c b/gl/getline.c index ab054fba6b..c8c9244a04 100644 --- a/gl/getline.c +++ b/gl/getline.c @@ -1,5 +1,5 @@ /* getline.c --- Implementation of replacement getline function. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -18,9 +18,7 @@ /* Written by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include "getdelim.h" #include "getline.h" diff --git a/gl/gettext.h b/gl/gettext.h index 70e2c1c267..f15eb6a25c 100644 --- a/gl/gettext.h +++ b/gl/gettext.h @@ -164,7 +164,7 @@ npgettext_aux (const char *domain, #include <string.h> #define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ - (__GNUC__ >= 3 || defined __cplusplus) + (__GNUC__ >= 3 || __GNUG__ >= 2 /* || __STDC_VERSION__ >= 199901L */ ) #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS #include <stdlib.h> diff --git a/gl/m4/lib-link.m4 b/gl/m4/lib-link.m4 index a196556c24..f95b7ba88d 100644 --- a/gl/m4/lib-link.m4 +++ b/gl/m4/lib-link.m4 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 9 (gettext-0.15.1) +# lib-link.m4 serial 9 (gettext-0.16) dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/gl/readline.c b/gl/readline.c index 52f002ed7b..f93a115293 100644 --- a/gl/readline.c +++ b/gl/readline.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* This module is intended to be used when the application only needs the readline interface. If you need more functions from the |