diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-11 23:28:40 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-11 23:28:40 +0900 |
commit | 0edd7fb3c63b3b794124646e0aa5548cd12b051e (patch) | |
tree | d886ede82efe40649c60e575a8725ba8b2c3a521 | |
parent | 4ed11b8c9588056f838145a16b30d176e76d3b32 (diff) | |
download | libksquirrel-0edd7fb3c63b3b794124646e0aa5548cd12b051e.tar.gz libksquirrel-0edd7fb3c63b3b794124646e0aa5548cd12b051e.zip |
Replaced _BSD_SOURCE with _DEFAULT_SOURCE. Removed AC_CHECK_GNU_EXTENSIONS.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r-- | acinclude.m4 | 32 | ||||
-rw-r--r-- | kernel/kls_png/ksquirrel-libs-png/pngconf.h | 28 |
2 files changed, 2 insertions, 58 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ee8dd64..13bed34 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2873,34 +2873,6 @@ AC_DEFUN([AC_CHECK_BOOL], AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) ]) -AC_DEFUN([AC_CHECK_GNU_EXTENSIONS], -[ -AC_MSG_CHECKING(if you need GNU extensions) -AC_CACHE_VAL(ac_cv_gnu_extensions, -[ -cat > conftest.c << EOF -#include <features.h> - -#ifdef __GNU_LIBRARY__ -yes -#endif -EOF - -if (eval "$ac_cpp conftest.c") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_gnu_extensions=yes -else - ac_cv_gnu_extensions=no -fi -]) - -AC_MSG_RESULT($ac_cv_gnu_extensions) -if test "$ac_cv_gnu_extensions" = "yes"; then - AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) -fi -]) - AC_DEFUN([KDE_CHECK_COMPILER_FLAG], [ AC_MSG_CHECKING([whether $CXX supports -$1]) @@ -3198,8 +3170,8 @@ AC_DEFUN([AC_CHECK_COMPILERS], CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" case $host in *-*-linux-gnu) - CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" + CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE $CFLAGS" + CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) ;; diff --git a/kernel/kls_png/ksquirrel-libs-png/pngconf.h b/kernel/kls_png/ksquirrel-libs-png/pngconf.h index 12a1848..cfd61bf 100644 --- a/kernel/kls_png/ksquirrel-libs-png/pngconf.h +++ b/kernel/kls_png/ksquirrel-libs-png/pngconf.h @@ -306,36 +306,8 @@ # define PNG_SETJMP_SUPPORTED #endif -#ifdef PNG_SETJMP_SUPPORTED -/* This is an attempt to force a single setjmp behaviour on Linux. If - * the X config stuff didn't define _BSD_SOURCE we wouldn't need this. - */ - -# ifdef __linux__ -# ifdef _BSD_SOURCE -# define PNG_SAVE_BSD_SOURCE -# undef _BSD_SOURCE -# endif -# ifdef _SETJMP_H - /* If you encounter a compiler error here, see the explanation - * near the end of INSTALL. - */ - __png.h__ already includes setjmp.h; - __dont__ include it again.; -# endif -# endif /* __linux__ */ - - /* include setjmp.h for error handling */ # include <setjmp.h> -# ifdef __linux__ -# ifdef PNG_SAVE_BSD_SOURCE -# define _BSD_SOURCE -# undef PNG_SAVE_BSD_SOURCE -# endif -# endif /* __linux__ */ -#endif /* PNG_SETJMP_SUPPORTED */ - #ifdef BSD # include <strings.h> #else |