diff options
| -rw-r--r--[-rwxr-xr-x] | build-aux/pmccabe2html | 16 | ||||
| -rw-r--r-- | gl/Makefile.am | 9 | ||||
| -rw-r--r-- | gl/getpagesize.c | 39 | ||||
| -rw-r--r-- | gl/m4/getpagesize.m4 | 29 | ||||
| -rw-r--r-- | gl/m4/gnulib-comp.m4 | 4 | ||||
| -rw-r--r-- | gl/tests/test-fseeko.c | 6 | ||||
| -rw-r--r-- | lib/gl/Makefile.am | 9 | ||||
| -rw-r--r-- | lib/gl/getpagesize.c | 39 | ||||
| -rw-r--r-- | lib/gl/m4/getpagesize.m4 | 29 | ||||
| -rw-r--r-- | lib/gl/m4/gnulib-comp.m4 | 4 | ||||
| -rw-r--r-- | lib/gl/tests/test-fseeko.c | 6 |
11 files changed, 19 insertions, 171 deletions
diff --git a/build-aux/pmccabe2html b/build-aux/pmccabe2html index bc0f6e80b9..dd397cff19 100755..100644 --- a/build-aux/pmccabe2html +++ b/build-aux/pmccabe2html @@ -1,6 +1,4 @@ -#!/bin/sh -exec awk -f "$0" "$@" -# pmccabe2html - pmccabe to html converter +# pmccabe2html - AWK script to convert pmccabe output to html # Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. @@ -23,16 +21,16 @@ exec awk -f "$0" "$@" # Typical Invocation is from a Makefile.am: # -# cyclo-libidn.html: +# cyclo-$(PACKAGE).html: # $(PMCCABE) ${top_srcdir}/lib/*.[ch] \ # | sort -nr \ # | $(AWK) -f ${top_srcdir}/build-aux/pmccabe2html \ # -v lang=html -v name="$(PACKAGE_NAME)" \ -# -v vcurl="http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=blob;f=%FILENAME%;hb=HEAD" \ -# -v url="http://www.gnu.org/software/libidn/" \ -# -v css=../../build-aux/pmccabe.css \ -# > tmp -# mv tmp $@ +# -v vcurl="http://git.savannah.gnu.org/gitweb/?p=$(PACKAGE).git;a=blob;f=%FILENAME%;hb=HEAD" \ +# -v url="http://www.gnu.org/software/$(PACKAGE)/" \ +# -v css=${top_srcdir}/build-aux/pmccabe.css \ +# > $@-tmp +# mv $@-tmp $@ # # The variables available are: # lang output language, either 'html' or 'wiki' diff --git a/gl/Makefile.am b/gl/Makefile.am index 3a138bc5dc..55c41e734c 100644 --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -263,15 +263,6 @@ EXTRA_libgnu_la_SOURCES += getline.c ## end gnulib module getline -## begin gnulib module getpagesize - - -EXTRA_DIST += getpagesize.c - -EXTRA_libgnu_la_SOURCES += getpagesize.c - -## end gnulib module getpagesize - ## begin gnulib module getpass-gnu diff --git a/gl/getpagesize.c b/gl/getpagesize.c deleted file mode 100644 index 5498aa9483..0000000000 --- a/gl/getpagesize.c +++ /dev/null @@ -1,39 +0,0 @@ -/* getpagesize emulation for systems where it cannot be done in a C macro. - - Copyright (C) 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 - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -/* Written by Bruno Haible and Martin Lambers. */ - -#include <config.h> - -/* Specification. */ -#include <unistd.h> - -/* This implementation is only for native Win32 systems. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - -# define WIN32_LEAN_AND_MEAN -# include <windows.h> - -int -getpagesize (void) -{ - SYSTEM_INFO system_info; - GetSystemInfo (&system_info); - return system_info.dwPageSize; -} - -#endif diff --git a/gl/m4/getpagesize.m4 b/gl/m4/getpagesize.m4 deleted file mode 100644 index 0d07a3a53b..0000000000 --- a/gl/m4/getpagesize.m4 +++ /dev/null @@ -1,29 +0,0 @@ -# getpagesize.m4 serial 7 -dnl Copyright (C) 2002, 2004-2005, 2007 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_FUNC_GETPAGESIZE], -[ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_FUNCS([getpagesize]) - if test $ac_cv_func_getpagesize = no; then - HAVE_GETPAGESIZE=0 - AC_CHECK_HEADERS([OS.h]) - if test $ac_cv_header_OS_h = yes; then - HAVE_OS_H=1 - fi - AC_CHECK_HEADERS([sys/param.h]) - if test $ac_cv_header_sys_param_h = yes; then - HAVE_SYS_PARAM_H=1 - fi - fi - case "$host_os" in - mingw*) - REPLACE_GETPAGESIZE=1 - AC_LIBOBJ([getpagesize]) - ;; - esac -]) diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4 index aebcc99a5d..9bfd46733d 100644 --- a/gl/m4/gnulib-comp.m4 +++ b/gl/m4/gnulib-comp.m4 @@ -88,8 +88,6 @@ AC_SUBST([LTALLOCA]) gl_STDIO_MODULE_INDICATOR([getdelim]) gl_FUNC_GETLINE gl_STDIO_MODULE_INDICATOR([getline]) - gl_FUNC_GETPAGESIZE - gl_UNISTD_MODULE_INDICATOR([getpagesize]) gl_FUNC_GETPASS_GNU AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) @@ -385,7 +383,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/getaddrinfo.c lib/getdelim.c lib/getline.c - lib/getpagesize.c lib/getpass.c lib/getpass.h lib/gettext.h @@ -459,7 +456,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/getaddrinfo.m4 m4/getdelim.m4 m4/getline.m4 - m4/getpagesize.m4 m4/getpass.m4 m4/gettimeofday.m4 m4/gnulib-common.m4 diff --git a/gl/tests/test-fseeko.c b/gl/tests/test-fseeko.c index 9c284da500..93b0adc361 100644 --- a/gl/tests/test-fseeko.c +++ b/gl/tests/test-fseeko.c @@ -21,6 +21,12 @@ #include <stdio.h> #include <stdlib.h> +/* None of the files accessed by this test are large, so disable the + fseek link warning if we are not using the gnulib fseek module. */ +#if !GNULIB_FSEEK +# undef fseek +#endif + #define ASSERT(expr) \ do \ { \ diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am index 2b84f52b63..1be730560b 100644 --- a/lib/gl/Makefile.am +++ b/lib/gl/Makefile.am @@ -153,15 +153,6 @@ EXTRA_liblgnu_la_SOURCES += fseeko.c ## end gnulib module fseeko -## begin gnulib module getpagesize - - -EXTRA_DIST += getpagesize.c - -EXTRA_liblgnu_la_SOURCES += getpagesize.c - -## end gnulib module getpagesize - ## begin gnulib module gettext # This is for those projects which use "gettextize --intl" to put a source-code diff --git a/lib/gl/getpagesize.c b/lib/gl/getpagesize.c deleted file mode 100644 index febcbf34b5..0000000000 --- a/lib/gl/getpagesize.c +++ /dev/null @@ -1,39 +0,0 @@ -/* getpagesize emulation for systems where it cannot be done in a C macro. - - Copyright (C) 2007 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -/* Written by Bruno Haible and Martin Lambers. */ - -#include <config.h> - -/* Specification. */ -#include <unistd.h> - -/* This implementation is only for native Win32 systems. */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - -# define WIN32_LEAN_AND_MEAN -# include <windows.h> - -int -getpagesize (void) -{ - SYSTEM_INFO system_info; - GetSystemInfo (&system_info); - return system_info.dwPageSize; -} - -#endif diff --git a/lib/gl/m4/getpagesize.m4 b/lib/gl/m4/getpagesize.m4 deleted file mode 100644 index 0d07a3a53b..0000000000 --- a/lib/gl/m4/getpagesize.m4 +++ /dev/null @@ -1,29 +0,0 @@ -# getpagesize.m4 serial 7 -dnl Copyright (C) 2002, 2004-2005, 2007 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_FUNC_GETPAGESIZE], -[ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_FUNCS([getpagesize]) - if test $ac_cv_func_getpagesize = no; then - HAVE_GETPAGESIZE=0 - AC_CHECK_HEADERS([OS.h]) - if test $ac_cv_header_OS_h = yes; then - HAVE_OS_H=1 - fi - AC_CHECK_HEADERS([sys/param.h]) - if test $ac_cv_header_sys_param_h = yes; then - HAVE_SYS_PARAM_H=1 - fi - fi - case "$host_os" in - mingw*) - REPLACE_GETPAGESIZE=1 - AC_LIBOBJ([getpagesize]) - ;; - esac -]) diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4 index 9265e446b2..e6389f0df3 100644 --- a/lib/gl/m4/gnulib-comp.m4 +++ b/lib/gl/m4/gnulib-comp.m4 @@ -49,8 +49,6 @@ AC_DEFUN([lgl_INIT], gl_FUNC_FSEEKO gl_STDIO_MODULE_INDICATOR([fseeko]) gl_FUNC - gl_FUNC_GETPAGESIZE - gl_UNISTD_MODULE_INDICATOR([getpagesize]) dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac. AM_GNU_GETTEXT_VERSION([0.17]) AC_SUBST([LIBINTL]) @@ -250,7 +248,6 @@ AC_DEFUN([lgl_FILE_LIST], [ lib/float+.h lib/float.in.h lib/fseeko.c - lib/getpagesize.c lib/gettext.h lib/lseek.c lib/memchr.c @@ -303,7 +300,6 @@ AC_DEFUN([lgl_FILE_LIST], [ m4/float_h.m4 m4/fseeko.m4 m4/func.m4 - m4/getpagesize.m4 m4/gettext.m4 m4/glibc2.m4 m4/glibc21.m4 diff --git a/lib/gl/tests/test-fseeko.c b/lib/gl/tests/test-fseeko.c index 9c284da500..93b0adc361 100644 --- a/lib/gl/tests/test-fseeko.c +++ b/lib/gl/tests/test-fseeko.c @@ -21,6 +21,12 @@ #include <stdio.h> #include <stdlib.h> +/* None of the files accessed by this test are large, so disable the + fseek link warning if we are not using the gnulib fseek module. */ +#if !GNULIB_FSEEK +# undef fseek +#endif + #define ASSERT(expr) \ do \ { \ |