diff options
| author | Paul Eggert | 2017-09-13 02:07:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-09-13 02:08:36 -0700 |
| commit | a0202fdc85ddc36b73a1c7c4f2d3ec45cd22c5e1 (patch) | |
| tree | 3de17df847aae5d9a8f899619466e918992b0669 /m4 | |
| parent | 4bef92e9e02d074de1d92e30dc5ef4dd62558c80 (diff) | |
| download | emacs-a0202fdc85ddc36b73a1c7c4f2d3ec45cd22c5e1.tar.gz emacs-a0202fdc85ddc36b73a1c7c4f2d3ec45cd22c5e1.zip | |
Merge from Gnulib
This incorporates:
2017-09-13 all: prefer https: URLs
This just changes http: to https: in comments,
in files copied from Gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/getgroups.m4 | 2 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 2 | ||||
| -rw-r--r-- | m4/std-gnu11.m4 | 2 | ||||
| -rw-r--r-- | m4/stdalign.m4 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index 02ce2353ca4..17f7409944e 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 | |||
| @@ -12,7 +12,7 @@ dnl A wrapper around AC_FUNC_GETGROUPS. | |||
| 12 | m4_version_prereq([2.70], [] ,[ | 12 | m4_version_prereq([2.70], [] ,[ |
| 13 | 13 | ||
| 14 | # This is taken from the following Autoconf patch: | 14 | # This is taken from the following Autoconf patch: |
| 15 | # http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 | 15 | # https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 |
| 16 | AC_DEFUN([AC_FUNC_GETGROUPS], | 16 | AC_DEFUN([AC_FUNC_GETGROUPS], |
| 17 | [ | 17 | [ |
| 18 | AC_REQUIRE([AC_TYPE_GETGROUPS])dnl | 18 | AC_REQUIRE([AC_TYPE_GETGROUPS])dnl |
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 13504a8ca20..c5517529f09 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | # GNU General Public License for more details. | 12 | # GNU General Public License for more details. |
| 13 | # | 13 | # |
| 14 | # You should have received a copy of the GNU General Public License | 14 | # You should have received a copy of the GNU General Public License |
| 15 | # along with this file. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this file. If not, see <https://www.gnu.org/licenses/>. |
| 16 | # | 16 | # |
| 17 | # As a special exception to the GNU General Public License, | 17 | # As a special exception to the GNU General Public License, |
| 18 | # this file may be distributed as part of a program that | 18 | # this file may be distributed as part of a program that |
diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4 index 9dae9b1ccf1..bd34aa1a268 100644 --- a/m4/std-gnu11.m4 +++ b/m4/std-gnu11.m4 | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | # GNU General Public License for more details. | 20 | # GNU General Public License for more details. |
| 21 | # | 21 | # |
| 22 | # You should have received a copy of the GNU General Public License | 22 | # You should have received a copy of the GNU General Public License |
| 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 23 | # along with this program. If not, see <https://www.gnu.org/licenses/>. |
| 24 | 24 | ||
| 25 | # Written by David MacKenzie, with help from | 25 | # Written by David MacKenzie, with help from |
| 26 | # Akim Demaille, Paul Eggert, | 26 | # Akim Demaille, Paul Eggert, |
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 0652a1e4af5..f091aa58c29 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 | |||
| @@ -18,7 +18,7 @@ AC_DEFUN([gl_STDALIGN_H], | |||
| 18 | 18 | ||
| 19 | /* Test that alignof yields a result consistent with offsetof. | 19 | /* Test that alignof yields a result consistent with offsetof. |
| 20 | This catches GCC bug 52023 | 20 | This catches GCC bug 52023 |
| 21 | <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. */ | 21 | <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. */ |
| 22 | #ifdef __cplusplus | 22 | #ifdef __cplusplus |
| 23 | template <class t> struct alignof_helper { char a; t b; }; | 23 | template <class t> struct alignof_helper { char a; t b; }; |
| 24 | # define ao(type) offsetof (alignof_helper<type>, b) | 24 | # define ao(type) offsetof (alignof_helper<type>, b) |