From: Bruno Haible Date: Tue, 12 Jul 2011 09:56:28 +0000 (+0200) Subject: Rename module '_Noreturn' to 'snippet/_Noreturn'. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ee6fd473628159570b5495f59f4c560a3869dda;p=pspp Rename module '_Noreturn' to 'snippet/_Noreturn'. * modules/snippet/_Noreturn: Renamed from modules/_Noreturn. (Files, Makefile.am): Update. * build-aux/snippet/_Noreturn.h: Renamed from build-aux/_Noreturn.h. * modules/stdlib (Depends-on): Update. --- diff --git a/ChangeLog b/ChangeLog index 45e9b35b49..0e6eb43f77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-07-12 Bruno Haible + + Rename module '_Noreturn' to 'snippet/_Noreturn'. + * modules/snippet/_Noreturn: Renamed from modules/_Noreturn. + (Files, Makefile.am): Update. + * build-aux/snippet/_Noreturn.h: Renamed from build-aux/_Noreturn.h. + * modules/stdlib (Depends-on): Update. + 2011-07-12 Bruno Haible * NEWS: Mention the changes. diff --git a/build-aux/_Noreturn.h b/build-aux/_Noreturn.h deleted file mode 100644 index 1a7b4daed0..0000000000 --- a/build-aux/_Noreturn.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _Noreturn -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ - || 0x5110 <= __SUNPRO_C) -# define _Noreturn __attribute__ ((__noreturn__)) -# elif 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn -# endif -#endif diff --git a/build-aux/snippet/_Noreturn.h b/build-aux/snippet/_Noreturn.h new file mode 100644 index 0000000000..1a7b4daed0 --- /dev/null +++ b/build-aux/snippet/_Noreturn.h @@ -0,0 +1,10 @@ +#ifndef _Noreturn +# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ + || 0x5110 <= __SUNPRO_C) +# define _Noreturn __attribute__ ((__noreturn__)) +# elif 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn +# endif +#endif diff --git a/modules/_Noreturn b/modules/_Noreturn deleted file mode 100644 index 68ba4f71b2..0000000000 --- a/modules/_Noreturn +++ /dev/null @@ -1,27 +0,0 @@ -Description: -The _Noreturn keyword of C1X. - -Applicability: -all - -Files: -build-aux/_Noreturn.h - -Depends-on: - -configure.ac: - -Makefile.am: -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that -# need it. This is ensured by the applicability 'all' defined above. - -_NORETURN_H=$(top_srcdir)/build-aux/_Noreturn.h - -Include: - -License: -LGPLv2+ - -Maintainer: -all diff --git a/modules/snippet/_Noreturn b/modules/snippet/_Noreturn new file mode 100644 index 0000000000..2b93a70a27 --- /dev/null +++ b/modules/snippet/_Noreturn @@ -0,0 +1,27 @@ +Description: +The _Noreturn keyword of C1X. + +Applicability: +all + +Files: +build-aux/snippet/_Noreturn.h + +Depends-on: + +configure.ac: + +Makefile.am: +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all Makefile.am that +# need it. This is ensured by the applicability 'all' defined above. + +_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h + +Include: + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/stdlib b/modules/stdlib index 380f13b6db..9ab19ee486 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -6,11 +6,11 @@ lib/stdlib.in.h m4/stdlib_h.m4 Depends-on: -_Noreturn include_next snippet/arg-nonnull snippet/c++defs snippet/warn-on-use +snippet/_Noreturn stddef unistd