Mercurial > hg > octave-lojdl > gnulib-hg
changeset 9761:f63d3075f044
Rename __func__ module to func.
Suggested by Eric Blake <ebb9@byu.net>.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Thu, 06 Mar 2008 12:01:44 +0100 |
| parents | e80f91c10083 |
| children | 5b0dc929e56e |
| files | doc/gnulib.texi m4/__func__.m4 m4/func.m4 modules/__func__ modules/__func__-tests modules/func modules/func-tests tests/test-__func__.c tests/test-func.c |
| diffstat | 9 files changed, 94 insertions(+), 94 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/gnulib.texi +++ b/doc/gnulib.texi @@ -5746,7 +5746,7 @@ * gcd:: * Regular expressions:: * Supporting Relocation:: -* __func__:: +* func:: @end menu @node alloca @@ -5826,10 +5826,10 @@ @include regexprops-generic.texi -@node __func__ -@section __func__ - -The @code{__func__} module makes sure that you can use the predefined +@node func +@section func + +The @code{func} module makes sure that you can use the predefined identifier @code{__func__} as defined by C99 in your code. A small example is:
deleted file mode 100644 --- a/m4/__func__.m4 +++ /dev/null @@ -1,20 +0,0 @@ -# __func__.m4 serial 1 -dnl Copyright (C) 2008 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. - -# Written by Simon Josefsson - -AC_DEFUN([gl___FUNC__], -[ - AC_CACHE_CHECK([whether __func__ is available], [gl_cv_var___func__], - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], [[const char *str = __func__;]])], - [gl_cv_var___func__=yes], - [gl_cv_var___func__=no])) - if test "$gl_cv_var___func__" != yes; then - AC_DEFINE([__func__], ["<unknown function>"], - [Define as a replacement for the ISO C99 __func__ variable.]) - fi -])
new file mode 100644 --- /dev/null +++ b/m4/func.m4 @@ -0,0 +1,20 @@ +# func.m4 serial 2 +dnl Copyright (C) 2008 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. + +# Written by Simon Josefsson + +AC_DEFUN([gl_FUNC], +[ + AC_CACHE_CHECK([whether __func__ is available], [gl_cv_var_func], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[]], [[const char *str = __func__;]])], + [gl_cv_var_func=yes], + [gl_cv_var_func=no])) + if test "$gl_cv_var_func" != yes; then + AC_DEFINE([__func__], ["<unknown function>"], + [Define as a replacement for the ISO C99 __func__ variable.]) + fi +])
deleted file mode 100644 --- a/modules/__func__ +++ /dev/null @@ -1,20 +0,0 @@ -Description: -Make sure __func__ is usable even on non-C99 platforms. - -Files: -m4/__func__.m4 - -Depends-on: - -configure.ac: -gl___FUNC__ - -Makefile.am: - -Include: - -License: -LGPL - -Maintainer: -Simon Josefsson
deleted file mode 100644 --- a/modules/__func__-tests +++ /dev/null @@ -1,8 +0,0 @@ -Files: -tests/test-__func__.c - -configure.ac: - -Makefile.am: -TESTS += test-__func__ -check_PROGRAMS += test-__func__
new file mode 100644 --- /dev/null +++ b/modules/func @@ -0,0 +1,20 @@ +Description: +Make sure __func__ is usable even on non-C99 platforms. + +Files: +m4/func.m4 + +Depends-on: + +configure.ac: +gl_FUNC + +Makefile.am: + +Include: + +License: +LGPL + +Maintainer: +Simon Josefsson
new file mode 100644 --- /dev/null +++ b/modules/func-tests @@ -0,0 +1,8 @@ +Files: +tests/test-func.c + +configure.ac: + +Makefile.am: +TESTS += test-func +check_PROGRAMS += test-func
deleted file mode 100644 --- a/tests/test-__func__.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Test whether __func__ is available - Copyright (C) 2008 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 <bruno@clisp.org>, 2008. */ - -#include <config.h> - -#include <string.h> -#include <stdio.h> -#include <stdlib.h> - -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - abort (); \ - } \ - } \ - while (0) - -int -main () -{ - ASSERT (strlen (__func__) + 1 == sizeof __func__); - return 0; -}
new file mode 100644 --- /dev/null +++ b/tests/test-func.c @@ -0,0 +1,41 @@ +/* Test whether __func__ is available + Copyright (C) 2008 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 <bruno@clisp.org>, 2008. */ + +#include <config.h> + +#include <string.h> +#include <stdio.h> +#include <stdlib.h> + +#define ASSERT(expr) \ + do \ + { \ + if (!(expr)) \ + { \ + fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ + abort (); \ + } \ + } \ + while (0) + +int +main () +{ + ASSERT (strlen (__func__) + 1 == sizeof __func__); + return 0; +}