Xisco Fauli
e7c0aca49e
Otherwise it fails with
/home/tdf/lode/jenkins/workspace/android_arm/workdir/UnpackedTarball/afdko/c/shared/sha1.c:10:27: error: typedef redefinition with different types ('unsigned long' vs '__uint32_t' (aka 'unsigned int'))
10 | typedef unsigned long int uint32_t;
| ^
/home/tdf/Android/Sdk/ndk/27.2.12479018/toolchains/llvm/prebuilt/linux-x86_64/bin/../sysroot/usr/include/stdint.h:65:23: note: previous definition is here
65 | typedef __uint32_t uint32_t;
| ^
1 error generated.
Change-Id: I0fa7ebbce3dc0f443f6a576e9e2d11d80e375336
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207325
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
19 lines
508 B
Diff
19 lines
508 B
Diff
--- afdko/c/shared/sha1.c 2026-06-26 00:09:12.530617735 +0200
|
|
+++ afdko/c/shared/sha1.c 2026-06-26 00:09:22.842585047 +0200
|
|
@@ -5,14 +5,7 @@
|
|
|
|
#include <stdio.h>
|
|
#include <limits.h> /* to get info about range unsigned int */
|
|
-
|
|
-#if ULONG_MAX == 4294967295U
|
|
-typedef unsigned long int uint32_t;
|
|
-#elif UINT_MAX == 4294967295U
|
|
-typedef unsigned int uint32_t;
|
|
-#else
|
|
-#error "There must be a way to get an unsigned 32 bit integer"
|
|
-#endif
|
|
+#include <stdint.h>
|
|
|
|
typedef struct sha1_ctx {
|
|
uint32_t H[5];
|