From 5e4c2e5a362d7af98182b54a1295cffad08bbf7d Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Tue, 4 Mar 2008 15:37:59 +0100 Subject: [PATCH] Add module __func__ to provide C99 __func__ variable. --- doc/gnulib.texi | 14 ++++++++++++++ m4/__func__.m4 | 20 ++++++++++++++++++++ modules/__func__ | 20 ++++++++++++++++++++ modules/__func__-tests | 8 ++++++++ tests/test-__func__.c | 41 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 m4/__func__.m4 create mode 100644 modules/__func__ create mode 100644 modules/__func__-tests create mode 100644 tests/test-__func__.c diff --git a/doc/gnulib.texi b/doc/gnulib.texi index 270bcb7e70..31f51df92d 100644 --- a/doc/gnulib.texi +++ b/doc/gnulib.texi @@ -5746,6 +5746,7 @@ This list of functions is sorted according to the header that declares them. * gcd:: * Regular expressions:: * Supporting Relocation:: +* __func__:: @end menu @node alloca @@ -5825,6 +5826,19 @@ generated automatically. @include regexprops-generic.texi +@node __func__ +@section __func__ + +The @code{__func__} module makes sure that you can use the +@code{__func__} variable as defined by C99 in your code. + +A small example is: + +@smallexample +#include +... +printf ("%s: something happened\n", __func__); +@end smallexample @node GNU Free Documentation License @appendix GNU Free Documentation License diff --git a/m4/__func__.m4 b/m4/__func__.m4 new file mode 100644 index 0000000000..ee39f42f90 --- /dev/null +++ b/m4/__func__.m4 @@ -0,0 +1,20 @@ +# __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__], [""], + [Define as a replacement for the ISO C99 __func__ variable.]) + fi +]) diff --git a/modules/__func__ b/modules/__func__ new file mode 100644 index 0000000000..79eae75785 --- /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 diff --git a/modules/__func__-tests b/modules/__func__-tests new file mode 100644 index 0000000000..4d821a3f89 --- /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__ diff --git a/tests/test-__func__.c b/tests/test-__func__.c new file mode 100644 index 0000000000..afa6159a2a --- /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 . */ + +/* Written by Bruno Haible , 2008. */ + +#include + +#include +#include +#include + +#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; +} -- 2.30.2