aboutsummaryrefslogtreecommitdiffstats
path: root/lib/c++defs.h
diff options
context:
space:
mode:
authorPaul Eggert2017-09-13 02:07:03 -0700
committerPaul Eggert2017-09-13 02:08:36 -0700
commita0202fdc85ddc36b73a1c7c4f2d3ec45cd22c5e1 (patch)
tree3de17df847aae5d9a8f899619466e918992b0669 /lib/c++defs.h
parent4bef92e9e02d074de1d92e30dc5ef4dd62558c80 (diff)
downloademacs-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 'lib/c++defs.h')
-rw-r--r--lib/c++defs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/c++defs.h b/lib/c++defs.h
index f03f3591c35..09dcd3e0687 100644
--- a/lib/c++defs.h
+++ b/lib/c++defs.h
@@ -12,7 +12,7 @@
12 General Public License for more details. 12 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 program. If not, see <http://www.gnu.org/licenses/>. */ 15 along with this program. If not, see <https://www.gnu.org/licenses/>. */
16 16
17#ifndef _GL_CXXDEFS_H 17#ifndef _GL_CXXDEFS_H
18#define _GL_CXXDEFS_H 18#define _GL_CXXDEFS_H
@@ -266,7 +266,7 @@
266 _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) 266 _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
267# define _GL_CXXALIASWARN_1(func,namespace) \ 267# define _GL_CXXALIASWARN_1(func,namespace) \
268 _GL_CXXALIASWARN_2 (func, namespace) 268 _GL_CXXALIASWARN_2 (func, namespace)
269/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>, 269/* To work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
270 we enable the warning only when not optimizing. */ 270 we enable the warning only when not optimizing. */
271# if !__OPTIMIZE__ 271# if !__OPTIMIZE__
272# define _GL_CXXALIASWARN_2(func,namespace) \ 272# define _GL_CXXALIASWARN_2(func,namespace) \
@@ -294,7 +294,7 @@
294 GNULIB_NAMESPACE) 294 GNULIB_NAMESPACE)
295# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ 295# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
296 _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) 296 _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
297/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>, 297/* To work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
298 we enable the warning only when not optimizing. */ 298 we enable the warning only when not optimizing. */
299# if !__OPTIMIZE__ 299# if !__OPTIMIZE__
300# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ 300# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \