diff mbox series

[02/59] Support stdckdint.h internally if older GCC

Message ID 20250105055750.1668721-3-eggert@cs.ucla.edu (mailing list archive)
State New
Headers
Series time: sync mktime from Gnulib |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Paul Eggert Jan. 5, 2025, 5:56 a.m. UTC 
  * include/stdckdint.h: New file.
* include/stdckdint.in.h: New file, copied from Gnulib.
---
 CONTRIBUTED-BY         |  6 ++++++
 SHARED-FILES           |  2 ++
 include/stdckdint.h    |  6 ++++++
 include/stdckdint.in.h | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 include/stdckdint.h
 create mode 100644 include/stdckdint.in.h
diff mbox series

Patch

diff --git a/CONTRIBUTED-BY b/CONTRIBUTED-BY
index 652642fe86..87ba0dfc58 100644
--- a/CONTRIBUTED-BY
+++ b/CONTRIBUTED-BY
@@ -1418,6 +1418,12 @@  include/list.h:
 include/list_t.h:
     Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
+include/stdckdint.h:
+    Written by Paul Eggert.
+
+include/stdckdint.in.h:
+    Written by Paul Eggert.
+
 inet/bug-if1.c:
     Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
 
diff --git a/SHARED-FILES b/SHARED-FILES
index 444eff5141..2edeef7f03 100644
--- a/SHARED-FILES
+++ b/SHARED-FILES
@@ -35,6 +35,8 @@  gnulib:
   include/intprops.h
   # Merged from gnulib 2021-09-21
   include/regex.h
+  # Merged from gnulib 2024-10-14
+  include/stdckdint.in.h
   locale/programs/3level.h
   # Merged from gnulib 2014-6-23
   malloc/obstack.c
diff --git a/include/stdckdint.h b/include/stdckdint.h
new file mode 100644
index 0000000000..713fb4559d
--- /dev/null
+++ b/include/stdckdint.h
@@ -0,0 +1,6 @@ 
+#if __GNUC__ < 14
+# include <stdbool.h>
+# include "stdckdint.in.h"
+#else
+# include_next <stdckdint.h>
+#endif
diff --git a/include/stdckdint.in.h b/include/stdckdint.in.h
new file mode 100644
index 0000000000..83277b728e
--- /dev/null
+++ b/include/stdckdint.in.h
@@ -0,0 +1,35 @@ 
+/* stdckdint.h -- checked integer arithmetic
+
+   Copyright 2022-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_STDCKDINT_H
+#define _GL_STDCKDINT_H
+
+#include "intprops-internal.h"
+
+/* Store into *R the low-order bits of A + B, A - B, A * B, respectively.
+   Return 1 if the result overflows, 0 otherwise.
+   A, B, and *R can have any integer type other than char, bool, a
+   bit-precise integer type, or an enumeration type.
+
+   These are like the standard macros introduced in C23, except that
+   arguments should not have side effects.  */
+
+#define ckd_add(r, a, b) ((bool) _GL_INT_ADD_WRAPV (a, b, r))
+#define ckd_sub(r, a, b) ((bool) _GL_INT_SUBTRACT_WRAPV (a, b, r))
+#define ckd_mul(r, a, b) ((bool) _GL_INT_MULTIPLY_WRAPV (a, b, r))
+
+#endif /* _GL_STDCKDINT_H */