bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: strings.h in argz.c?


From: Ralf Wildenhues
Subject: Re: strings.h in argz.c?
Date: Sun, 21 Jan 2007 16:55:38 +0100
User-agent: Mutt/1.5.13 (2006-08-11)

Hello Simon,

Apologies for the long delay.

* Simon Josefsson wrote on Mon, Oct 30, 2006 at 01:46:30PM CET:
> Bruno Haible <address@hidden> writes:

> >> Is strings.h needed on any modern platform?
> >
> > No.

> I see that argz.c comes from libtool.  Would this patch be acceptable?
> I'm cc:ing bug-libtool in case they have some legacy priority that
> demand strings.h.

We got a bug report about Libtool 1.5.22 and SunOS 4.1.x this year, so
I'm not doing any C89 cleanup on branch-1-5.

* Bruno Haible wrote on Mon, Oct 30, 2006 at 03:06:54PM CET:
> Simon Josefsson wrote:
> > I assume that memory.h is a side-effect of using strings.h, and that
> > memory.h is not needed today either?
> 
> Yes. Even on older systems like Solaris 2.4, AIX 4.3, IRIX 6.5, HP-UX 11,
> OSF/1 4.0, the contents of <memory.h> is also available through <string.h>.

Thanks.  Here's a quick audit of Libtool CVS HEAD to assume more of C89.
I'm really not sure whether I should apply it: the mere prospect of
lessening testsuite exposure on older hosts seems to me that it could
easily be more of a problem than the few, half a decade old lines that
nobody has needed to touch in a long time.

OTOH, the change may eventually cause 2 less header checks in user code;
that is, once all other checks for string.h and strings.h are eliminated
from their configury.

WDYT?

Cheers,
Ralf

2007-01-21  Ralf Wildenhues  <address@hidden>

        Assume C89.
        * libltdl/argz.c: Do not include strings.h nor memory.h, include
        string.h unconditionally.
        Patch by Simon Josefsson <address@hidden>.
        * libltdl/libltdl/lt__private.h: Likewise.
        * libltdl/m4/ltdl.m4 (LTDL_INIT): Do not check for string.h,
        strings.h, memory.h.
        * tests/cdemo/configure.ac: Assume presence of math.h.
        * tests/cdemo/foo.c: Likewise.
        * tests/demo/configure.ac: Likewise for math.h, string.h.
        Assume 'const'.  Drop obsolete AC_EXEEXT.
        * tests/demo/dlmain.c: Likewise.
        * tests/demo/foo.c: Likewise.
        * tests/depdemo/configure.ac: Likewise.
        * tests/depdemo/l4/l4.c: Likewise.
        * tests/f77demo/configure.ac: Likewise.  Also drop obsolete
        AC_OBJEXT.
        * tests/fcdemo/configure.ac: Likewise.
        * tests/mdemo/configure.ac: Likewise.
        * tests/mdemo/foo1.c: Likewise.
        * tests/mdemo/foo2.c: Likewise.
        * tests/mdemo2/configure.ac: Likewise.
        * tests/pdemo/configure.ac: Likewise.
        * tests/pdemo/longer_file_name_dlmain.c:
        * tests/pdemo/longer_file_name_foo.c: Likewise.
        * tests/pdemo/longer_file_name_foo2.c: Likewise.
        * tests/tagdemo/configure.ac: Likewise.
        * tests/tagdemo/foo.cpp: Likewise.

Index: libltdl/argz.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/argz.c,v
retrieving revision 1.9
diff -u -r1.9 argz.c
--- libltdl/argz.c      24 Oct 2006 20:33:38 -0000      1.9
+++ libltdl/argz.c      21 Jan 2007 15:49:45 -0000
@@ -1,5 +1,5 @@
 /* argz.c -- argz implementation for non-glibc systems
-   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
    Originally by Gary V. Vaughan  <address@hidden>
 
    NOTE: The canonical source of this file is maintained with the
@@ -40,15 +40,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <errno.h>
-
-#if defined(HAVE_STRING_H)
-#  include <string.h>
-#elif defined(HAVE_STRINGS_H)
-#  include <strings.h>
-#endif
-#if defined(HAVE_MEMORY_H)
-#  include <memory.h>
-#endif
+#include <string.h>
 
 #define EOS_CHAR '\0'
 
Index: libltdl/libltdl/lt__private.h
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/libltdl/lt__private.h,v
retrieving revision 1.10
diff -u -r1.10 lt__private.h
--- libltdl/libltdl/lt__private.h       26 Oct 2006 20:39:04 -0000      1.10
+++ libltdl/libltdl/lt__private.h       21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* lt__private.h -- internal apis for libltdl
-   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    Originally by Gary V. Vaughan  <address@hidden>
 
    NOTE: The canonical source of this file is maintained with the
@@ -40,22 +40,12 @@
 #include <ctype.h>
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #if defined(HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif
 
-#if defined(HAVE_STRING_H)
-#  include <string.h>
-#else
-#  if defined(HAVE_STRINGS_H)
-#    include <strings.h>
-#  endif
-#endif
-#if defined(HAVE_MEMORY_H)
-#  include <memory.h>
-#endif
-
 /* Import internal interfaces...  */
 #include "lt__alloc.h"
 #include "lt__dirent.h"
Index: libltdl/m4/ltdl.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/ltdl.m4,v
retrieving revision 1.30
diff -u -r1.30 ltdl.m4
--- libltdl/m4/ltdl.m4  25 Aug 2006 15:04:30 -0000      1.30
+++ libltdl/m4/ltdl.m4  21 Jan 2007 15:49:47 -0000
@@ -1,11 +1,11 @@
 # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
-# Copyright (C) 1999-2006 Free Software Foundation, Inc.
+# Copyright (C) 1999-2007 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 10 LTDL_INIT
+# serial 11 LTDL_INIT
 
 # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
 # ------------------------------------------
@@ -285,9 +285,8 @@
        [])])])
 AC_SUBST([LT_CONFIG_H])
 
-AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h 
dirent.h],
+AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
        [], [], [AC_INCLUDES_DEFAULT])
-AC_CHECK_HEADERS([string.h strings.h], [break], [], [AC_INCLUDES_DEFAULT])
 
 AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
 AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
Index: tests/cdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/cdemo/configure.ac,v
retrieving revision 1.15
diff -u -r1.15 configure.ac
--- tests/cdemo/configure.ac    23 Aug 2005 01:49:37 -0000      1.15
+++ tests/cdemo/configure.ac    21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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 published by
@@ -46,12 +46,6 @@
 
 
 ## ---------------------------- ##
-## C headers required by cdemo. ##
-## ---------------------------- ##
-AC_CHECK_HEADERS([math.h])
-
-
-## ---------------------------- ##
 ## Libraries required by cdemo. ##
 ## ---------------------------- ##
 LT_LIB_M
Index: tests/cdemo/foo.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/cdemo/foo.c,v
retrieving revision 1.2
diff -u -r1.2 foo.c
--- tests/cdemo/foo.c   22 Apr 2005 10:10:30 -0000      1.2
+++ tests/cdemo/foo.c   21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* foo.c -- trivial test library
-   Copyright (C) 1998-1999 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2007 Free Software Foundation, Inc.
    Originally by Thomas Tanner <address@hidden>
    This file is part of GNU Libtool.
 
@@ -21,9 +21,7 @@
 #include "foo.h"
 #include <stdio.h>
 
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 int
 foo()
Index: tests/demo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo/configure.ac,v
retrieving revision 1.13
diff -u -r1.13 configure.ac
--- tests/demo/configure.ac     23 Aug 2005 01:49:37 -0000      1.13
+++ tests/demo/configure.ac     21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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 published by
@@ -37,8 +37,6 @@
 ## compiler checks. ##
 ## ---------------- ##
 AC_PROG_CC
-AC_C_CONST
-AC_EXEEXT
 
 
 ## ----------------------- ##
@@ -58,12 +56,6 @@
 
 
 ## --------------------------- ##
-## C headers required by demo. ##
-## --------------------------- ##
-AC_CHECK_HEADERS([string.h math.h])
-
-
-## --------------------------- ##
 ## Libraries required by demo. ##
 ## --------------------------- ##
 LT_LIB_M
Index: tests/demo/dlmain.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo/dlmain.c,v
retrieving revision 1.4
diff -u -r1.4 dlmain.c
--- tests/demo/dlmain.c 1 Sep 2006 16:19:54 -0000       1.4
+++ tests/demo/dlmain.c 21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* dlmain.c -- hello test program that uses simulated dynamic linking
-   Copyright (C) 1996-1999, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2004, 2006, 2007 Free Software Foundation, Inc.
    This file is part of GNU Libtool.
 
 This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,7 @@
 
 #include "foo.h"
 #include <stdio.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
 
Index: tests/demo/foo.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo/foo.c,v
retrieving revision 1.2
diff -u -r1.2 foo.c
--- tests/demo/foo.c    22 Apr 2005 10:10:31 -0000      1.2
+++ tests/demo/foo.c    21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* foo.c -- trivial test function for libfoo
-   Copyright (C) 1996-1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2007 Free Software Foundation, Inc.
    Gordon Matzigkeit <address@hidden>, 1996
    This file is part of GNU Libtool.
 
@@ -21,10 +21,7 @@
 #include "foo.h"
 
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 /* Give a global variable definition. */
 int nothing = FOO_RET;
Index: tests/depdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo/configure.ac,v
retrieving revision 1.13
diff -u -r1.13 configure.ac
--- tests/depdemo/configure.ac  23 Aug 2005 01:49:37 -0000      1.13
+++ tests/depdemo/configure.ac  21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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 published by
@@ -37,7 +37,6 @@
 ## compiler checks. ##
 ## ---------------- ##
 AC_PROG_CC
-AC_EXEEXT
 
 ## ----------------------- ##
 ## Libtool initialisation. ##
@@ -52,12 +51,6 @@
 AC_SUBST([STATIC])
 
 ## ------------------------------ ##
-## C headers required by depdemo. ##
-## ------------------------------ ##
-AC_CHECK_HEADERS([math.h])
-
-
-## ------------------------------ ##
 ## Libraries required by depdemo. ##
 ## ------------------------------ ##
 LT_LIB_M
Index: tests/depdemo/l4/l4.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo/l4/l4.c,v
retrieving revision 1.3
diff -u -r1.3 l4.c
--- tests/depdemo/l4/l4.c       1 Sep 2006 16:19:55 -0000       1.3
+++ tests/depdemo/l4/l4.c       21 Jan 2007 15:49:47 -0000
@@ -1,6 +1,6 @@
 /* l4.c -- trivial test library
    Copyright (C) 1998-1999 Thomas Tanner <address@hidden>
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
    This file is part of GNU Libtool.
 
 This program is free software; you can redistribute it and/or modify
@@ -22,10 +22,7 @@
 
 #include "l3/l3.h"
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 int    var_l4 = 0;
 
Index: tests/f77demo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/f77demo/configure.ac,v
retrieving revision 1.11
diff -u -r1.11 configure.ac
--- tests/f77demo/configure.ac  23 Aug 2005 01:49:37 -0000      1.11
+++ tests/f77demo/configure.ac  21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2007 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 published by
@@ -46,18 +46,6 @@
 dnl Check for underscoring of external names
 AC_F77_WRAPPERS
 
-# As of the writing of this demo, GNU Autoconf's AC_OBJEXT and
-# AC_EXEEXT macros only works for C compilers!
-# Libtool's setup macro calls AC_OBJEXT and AC_EXEEXT without setting
-# the test language to C.  We do it before any libtool setup macros are
-# called so that the proper values are cached beforehand.  We also do
-# it before any linker flags (LDFLAGS) are set so that fortran specific
-# ones don't break the tests.
-AC_LANG_PUSH([C])
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_POP
-
 ## ----------------------- ##
 ## Libtool initialisation. ##
 ## ----------------------- ##
Index: tests/fcdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/fcdemo/configure.ac,v
retrieving revision 1.2
diff -u -r1.2 configure.ac
--- tests/fcdemo/configure.ac   23 Aug 2005 01:49:37 -0000      1.2
+++ tests/fcdemo/configure.ac   21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2007 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 published by
@@ -53,19 +53,6 @@
 AC_FC_FREEFORM
 AC_LANG_POP
 
-
-# As of the writing of this demo, GNU Autoconf's AC_OBJEXT and
-# AC_EXEEXT macros only works for C compilers!
-# Libtool's setup macro calls AC_OBJEXT and AC_EXEEXT without setting
-# the test language to C.  We do it before any libtool setup macros are
-# called so that the proper values are cached beforehand.  We also do
-# it before any linker flags (LDFLAGS) are set so that fortran specific
-# ones don't break the tests.
-AC_LANG_PUSH([C])
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_POP
-
 ## ----------------------- ##
 ## Libtool initialisation. ##
 ## ----------------------- ##
Index: tests/mdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo/configure.ac,v
retrieving revision 1.13
diff -u -r1.13 configure.ac
--- tests/mdemo/configure.ac    23 Aug 2005 01:49:37 -0000      1.13
+++ tests/mdemo/configure.ac    21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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 published by
@@ -37,7 +37,6 @@
 ## C compiler checks. ##
 ## ------------------ ##
 AC_PROG_CC
-AC_C_CONST
 
 
 ## ----------------------- ##
@@ -56,12 +55,6 @@
 
 
 ## ---------------------------- ##
-## C headers required by mdemo. ##
-## ---------------------------- ##
-AC_CHECK_HEADERS([math.h])
-
-
-## ---------------------------- ##
 ## Libraries required by mdemo. ##
 ## ---------------------------- ##
 LT_LIB_M
Index: tests/mdemo/foo1.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo/foo1.c,v
retrieving revision 1.3
diff -u -r1.3 foo1.c
--- tests/mdemo/foo1.c  4 Sep 2006 17:27:27 -0000       1.3
+++ tests/mdemo/foo1.c  21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* foo1.c -- trivial test library
-   Copyright (C) 1998-1999 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2007 Free Software Foundation, Inc.
    Originally by Thomas Tanner <address@hidden>
    This file is part of GNU Libtool.
 
@@ -20,10 +20,7 @@
 
 #include "foo.h"
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 #define nothing foo1_LTX_nothing
 #define foo1   foo1_LTX_foo1
Index: tests/mdemo/foo2.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo/foo2.c,v
retrieving revision 1.3
diff -u -r1.3 foo2.c
--- tests/mdemo/foo2.c  4 Sep 2006 17:27:27 -0000       1.3
+++ tests/mdemo/foo2.c  21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* foo2.c -- trivial test library
-   Copyright (C) 1998-1999 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2007 Free Software Foundation, Inc.
    Originally by Thomas Tanner <address@hidden>
    This file is part of GNU Libtool.
 
@@ -20,10 +20,7 @@
 
 #include "foo.h"
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 #define nothing libfoo2_LTX_nothing
 #define foo2   libfoo2_LTX_foo2
Index: tests/mdemo2/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo2/configure.ac,v
retrieving revision 1.13
diff -u -r1.13 configure.ac
--- tests/mdemo2/configure.ac   23 Aug 2005 01:49:37 -0000      1.13
+++ tests/mdemo2/configure.ac   21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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 published by
@@ -37,7 +37,6 @@
 ## C compiler checks. ##
 ## ------------------ ##
 AC_PROG_CC
-AC_C_CONST
 
 
 ## ----------------------- ##
@@ -51,16 +50,6 @@
 AC_SUBST([STATIC])
 
 
-## ----------------------------- ##
-## C headers required by mdemo2. ##
-## ----------------------------- ##
-
-
-## ----------------------------- ##
-## Libraries required by mdemo2. ##
-## ----------------------------- ##
-
-
 ## -------- ##
 ## Outputs. ##
 ## -------- ##
Index: tests/pdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo/configure.ac,v
retrieving revision 1.13
diff -u -r1.13 configure.ac
--- tests/pdemo/configure.ac    23 Aug 2005 01:49:37 -0000      1.13
+++ tests/pdemo/configure.ac    21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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 published by
@@ -37,7 +37,6 @@
 ## C compiler checks. ##
 ## ------------------ ##
 AC_PROG_CC
-AC_C_CONST
 
 
 ## ----------------------- ##
@@ -57,12 +56,6 @@
 
 
 ## ---------------------------- ##
-## C headers required by pdemo. ##
-## ---------------------------- ##
-AC_CHECK_HEADERS([string.h math.h])
-
-
-## ---------------------------- ##
 ## Libraries required by pdemo. ##
 ## ---------------------------- ##
 LT_LIB_M
Index: tests/pdemo/longer_file_name_dlmain.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo/longer_file_name_dlmain.c,v
retrieving revision 1.4
diff -u -r1.4 longer_file_name_dlmain.c
--- tests/pdemo/longer_file_name_dlmain.c       1 Sep 2006 16:19:56 -0000       
1.4
+++ tests/pdemo/longer_file_name_dlmain.c       21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* dlmain.c -- hello test program that uses simulated dynamic linking
-   Copyright (C) 1996-1999, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2004, 2006, 2007 Free Software Foundation, Inc.
    This file is part of GNU Libtool.
 
 This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,7 @@
 
 #include "foo.h"
 #include <stdio.h>
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
 
Index: tests/pdemo/longer_file_name_foo.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo/longer_file_name_foo.c,v
retrieving revision 1.2
diff -u -r1.2 longer_file_name_foo.c
--- tests/pdemo/longer_file_name_foo.c  22 Apr 2005 10:10:31 -0000      1.2
+++ tests/pdemo/longer_file_name_foo.c  21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* foo.c -- trivial test function for libfoo
-   Copyright (C) 1996-1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2007 Free Software Foundation, Inc.
    Gordon Matzigkeit <address@hidden>, 1996
    This file is part of GNU Libtool.
 
@@ -23,10 +23,7 @@
 #undef _LIBFOO_COMPILATION_
 
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 /* Give a global variable definition. */
 int nothing = FOO_RET;
Index: tests/pdemo/longer_file_name_foo2.c
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo/longer_file_name_foo2.c,v
retrieving revision 1.2
diff -u -r1.2 longer_file_name_foo2.c
--- tests/pdemo/longer_file_name_foo2.c 22 Apr 2005 10:10:31 -0000      1.2
+++ tests/pdemo/longer_file_name_foo2.c 21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 /* foo.c -- trivial test function for libfoo
-   Copyright (C) 1996-1999 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2007 Free Software Foundation, Inc.
    Gordon Matzigkeit <address@hidden>, 1996
    This file is part of GNU Libtool.
 
@@ -23,10 +23,7 @@
 #undef _LIBFOO_COMPILATION_
 
 #include <stdio.h>
-
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 int
 foo2()
Index: tests/tagdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/tagdemo/configure.ac,v
retrieving revision 1.13
diff -u -r1.13 configure.ac
--- tests/tagdemo/configure.ac  12 Sep 2005 16:24:38 -0000      1.13
+++ tests/tagdemo/configure.ac  21 Jan 2007 15:49:47 -0000
@@ -1,5 +1,5 @@
 ## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2007 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 published by
@@ -69,19 +69,6 @@
 AC_LANG_POP([C++])
 
 
-# As of the writing of this demo, GNU Autoconf's AC_OBJEXT and
-# AC_EXEEXT macros only works for C compilers!
-# Libtool's setup macro calls AC_OBJEXT and AC_EXEEXT without setting
-# the test language to C.  We do it before any libtool setup macros are
-# called so that the proper values are cached beforehand.  We also do
-# it before any linker flags (LDFLAGS) are set so that C++ specific
-# ones don't break the tests.
-AC_LANG_PUSH([C])
-AC_OBJEXT
-AC_EXEEXT
-AC_LANG_POP
-
-
 ## ----------------------- ##
 ## Libtool initialisation. ##
 ## ----------------------- ##
@@ -92,12 +79,6 @@
 
 
 ## ------------------------------ ##
-## C headers required by tagdemo. ##
-## ------------------------------ ##
-AC_CHECK_HEADERS([math.h])
-
-
-## ------------------------------ ##
 ## Libraries required by tagdemo. ##
 ## ------------------------------ ##
 LT_LIB_M
Index: tests/tagdemo/foo.cpp
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/tagdemo/foo.cpp,v
retrieving revision 1.4
diff -u -r1.4 foo.cpp
--- tests/tagdemo/foo.cpp       17 Mar 2006 17:20:11 -0000      1.4
+++ tests/tagdemo/foo.cpp       21 Jan 2007 15:49:47 -0000
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //    foo.cpp -- trivial test library
-//    Copyright (C) 1998-2000 Free Software Foundation, Inc.
+//    Copyright (C) 1998-2000, 2007 Free Software Foundation, Inc.
 //    Originally by Thomas Tanner <address@hidden>
 //    This file is part of GNU Libtool.
 
@@ -30,9 +30,7 @@
 using namespace std;
 #endif
 
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 
 // Our C functions.
 int




reply via email to

[Prev in Thread] Current Thread [Next in Thread]