diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
commit | fa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch) | |
tree | 7d0ae09775ea950056193eaa2ca93844299d46f1 /gnulib-local/lib | |
parent | c78359d9542c86b972aac373efcf7bc7a8a560e5 (diff) | |
parent | 2959e59fab3bab834368adefd90bd4b1b094366b (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'gnulib-local/lib')
-rw-r--r-- | gnulib-local/lib/uninorm.in.h.diff | 9 | ||||
-rw-r--r-- | gnulib-local/lib/unistr.in.h.diff | 29 |
2 files changed, 20 insertions, 18 deletions
diff --git a/gnulib-local/lib/uninorm.in.h.diff b/gnulib-local/lib/uninorm.in.h.diff index 47f644e..f7e4ebb 100644 --- a/gnulib-local/lib/uninorm.in.h.diff +++ b/gnulib-local/lib/uninorm.in.h.diff @@ -1,11 +1,14 @@ -*** uninorm.in.h.orig 2009-04-05 12:38:24.000000000 +0200 ---- uninorm.in.h 2009-04-12 04:31:52.000000000 +0200 +*** uninorm.in.h.orig 2021-08-07 14:40:34.920237057 +0200 +--- uninorm.in.h 2021-08-08 02:17:17.145608518 +0200 *************** *** 18,23 **** ---- 18,26 ---- +--- 18,29 ---- #ifndef _UNINORM_H #define _UNINORM_H ++ /* Get common macros for C. */ ++ #include <unistring/cdefs.h> ++ + /* Get LIBUNISTRING_DLL_VARIABLE. */ + #include <unistring/woe32dll.h> + diff --git a/gnulib-local/lib/unistr.in.h.diff b/gnulib-local/lib/unistr.in.h.diff index 0b31c86..7bd18e7 100644 --- a/gnulib-local/lib/unistr.in.h.diff +++ b/gnulib-local/lib/unistr.in.h.diff @@ -1,28 +1,27 @@ -*** unistr.in.h.orig 2009-12-24 23:21:27.000000000 +0100 ---- unistr.in.h 2009-12-25 02:04:40.000000000 +0100 +*** lib/unistr.in.h.orig 2021-08-01 16:43:54.915090697 +0200 +--- lib/unistr.in.h 2021-08-01 15:52:07.388856862 +0200 *************** -*** 20,29 **** - #include "unitypes.h" +*** 19,26 **** - /* Get common macros for C. */ -! #include "unused-parameter.h" + #include "unitypes.h" /* Get bool. */ ! #include <stdbool.h> - /* Get size_t. */ + /* Get size_t, ptrdiff_t. */ #include <stddef.h> ---- 20,32 ---- - #include "unitypes.h" +--- 19,32 ---- - /* Get common macros for C. */ -! #include <unistring/cdefs.h> -! -! /* Get inline if available. */ -! #include <unistring/inline.h> + #include "unitypes.h" ++ /* Get common macros for C. */ ++ #include <unistring/cdefs.h> ++ ++ /* Get inline if available. */ ++ #include <unistring/inline.h> ++ /* Get bool. */ ! #include <unistring/stdbool.h> - /* Get size_t. */ + /* Get size_t, ptrdiff_t. */ #include <stddef.h> |