From 121313f4c0ffdb86c6110abe6e8a527483b8b9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 7 Jan 2004 23:23:06 +0100
Subject: [PATCH] * nettle-types.h: New (generated) file, to be used instead of
 including <inttypes.h> directly. Updated all users of inttypes.h.

Rev: src/nettle/aes.h:1.7
Rev: src/nettle/aesdata.c:1.3
Rev: src/nettle/arcfour.h:1.5
Rev: src/nettle/base16.h:1.3
Rev: src/nettle/base64.h:1.14
Rev: src/nettle/bignum.h:1.8
Rev: src/nettle/blowfish.h:1.9
Rev: src/nettle/cast128.h:1.5
Rev: src/nettle/cbc.h:1.5
Rev: src/nettle/des.h:1.9
Rev: src/nettle/dsa.h:1.9
Rev: src/nettle/knuth-lfib.h:1.3
Rev: src/nettle/md2.h:1.3
Rev: src/nettle/md4.h:1.3
Rev: src/nettle/md5.h:1.7
Rev: src/nettle/memxor.h:1.3
Rev: src/nettle/nettle-meta.h:1.11
Rev: src/nettle/pkcs1.h:1.3
Rev: src/nettle/realloc.h:1.2
Rev: src/nettle/rsa.h:1.24
Rev: src/nettle/serpent.h:1.7
Rev: src/nettle/sexp.h:1.16
Rev: src/nettle/sha.h:1.4
Rev: src/nettle/twofish.h:1.6
---
 aes.h         | 2 +-
 aesdata.c     | 3 ++-
 arcfour.h     | 2 +-
 base16.h      | 2 +-
 base64.h      | 2 +-
 bignum.h      | 2 +-
 blowfish.h    | 2 +-
 cast128.h     | 2 +-
 cbc.h         | 2 +-
 des.h         | 2 +-
 dsa.h         | 3 ++-
 knuth-lfib.h  | 2 +-
 md2.h         | 2 +-
 md4.h         | 2 +-
 md5.h         | 2 +-
 memxor.h      | 2 +-
 nettle-meta.h | 2 +-
 pkcs1.h       | 2 +-
 realloc.h     | 2 +-
 rsa.h         | 2 +-
 serpent.h     | 2 +-
 sexp.h        | 2 +-
 sha.h         | 2 +-
 twofish.h     | 2 +-
 24 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/aes.h b/aes.h
index 87464cf4..97d8deef 100644
--- a/aes.h
+++ b/aes.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_AES_H_INCLUDED
 #define NETTLE_AES_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define aes_set_encrypt_key nettle_aes_set_encrypt_key
diff --git a/aesdata.c b/aesdata.c
index babb382f..0fc1b310 100644
--- a/aesdata.c
+++ b/aesdata.c
@@ -3,11 +3,12 @@
 #endif
 
 #include <assert.h>
-#include <inttypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "nettle-types.h"
+
 #if 1
 # define BYTE_FORMAT "0x%02x"
 # define BYTE_COLUMNS 8
diff --git a/arcfour.h b/arcfour.h
index 9499e981..66891f8a 100644
--- a/arcfour.h
+++ b/arcfour.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_ARCFOUR_H_INCLUDED
 #define NETTLE_ARCFOUR_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define arcfour_set_key nettle_arcfour_set_key
diff --git a/base16.h b/base16.h
index 2701725b..2631fae4 100644
--- a/base16.h
+++ b/base16.h
@@ -27,7 +27,7 @@
 #ifndef NETTLE_BASE16_H_INCLUDED
 #define NETTLE_BASE16_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define base16_encode_single nettle_base16_encode_single
diff --git a/base64.h b/base64.h
index 6ca0f1c8..7da84c15 100644
--- a/base64.h
+++ b/base64.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_BASE64_H_INCLUDED
 #define NETTLE_BASE64_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define base64_encode_init nettle_base64_encode_init
diff --git a/bignum.h b/bignum.h
index dce95126..4ee0726e 100644
--- a/bignum.h
+++ b/bignum.h
@@ -29,7 +29,7 @@
 #include "nettle-meta.h"
 
 #include <gmp.h>
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Size needed for signed encoding, including extra sign byte if
  * necessary. */
diff --git a/blowfish.h b/blowfish.h
index 7f7ddcd6..3d343c6d 100644
--- a/blowfish.h
+++ b/blowfish.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_BLOWFISH_H_INCLUDED
 #define NETTLE_BLOWFISH_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define blowfish_set_key nettle_blowfish_set_key
diff --git a/cast128.h b/cast128.h
index 39102cbc..b9437655 100644
--- a/cast128.h
+++ b/cast128.h
@@ -32,7 +32,7 @@
 #ifndef NETTLE_CAST128_H_INCLUDED
 #define NETTLE_CAST128_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define cast128_set_key nettle_cast128_set_key
diff --git a/cbc.h b/cbc.h
index 9428aa55..c2043768 100644
--- a/cbc.h
+++ b/cbc.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_CBC_H_INCLUDED
 #define NETTLE_CBC_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define cbc_encrypt nettle_cbc_encrypt
diff --git a/des.h b/des.h
index 25168d11..a6d34cdc 100644
--- a/des.h
+++ b/des.h
@@ -35,7 +35,7 @@
 #ifndef NETTLE_DES_H_INCLUDED
 #define NETTLE_DES_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Namespace mangling */
 #define des_set_key nettle_des_set_key
diff --git a/dsa.h b/dsa.h
index d7aaecf5..1f06136f 100644
--- a/dsa.h
+++ b/dsa.h
@@ -26,9 +26,10 @@
 #ifndef NETTLE_DSA_H_INCLUDED
 #define NETTLE_DSA_H_INCLUDED
 
-#include <inttypes.h>
 #include <gmp.h>
 
+#include "nettle-types.h"
+
 #include "sha.h"
 
 /* For nettle_random_func */
diff --git a/knuth-lfib.h b/knuth-lfib.h
index c8a1f93a..073c9df5 100644
--- a/knuth-lfib.h
+++ b/knuth-lfib.h
@@ -31,7 +31,7 @@
 #ifndef NETTLE_KNUTH_LFIB_H_INCLUDED
 #define NETTLE_KNUTH_LFIB_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Namespace mangling */
 #define knuth_lfib_init nettle_knuth_lfib_init
diff --git a/md2.h b/md2.h
index 68c73abe..2fbfbbcc 100644
--- a/md2.h
+++ b/md2.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_MD2_H_INCLUDED
 #define NETTLE_MD2_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define md2_init nettle_md2_init
diff --git a/md4.h b/md4.h
index 03288200..7ccf8c33 100644
--- a/md4.h
+++ b/md4.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_MD4_H_INCLUDED
 #define NETTLE_MD4_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define md4_init nettle_md4_init
diff --git a/md5.h b/md5.h
index 95e42c62..dc7c89a0 100644
--- a/md5.h
+++ b/md5.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_MD5_H_INCLUDED
 #define NETTLE_MD5_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define md5_init nettle_md5_init
diff --git a/memxor.h b/memxor.h
index 25621b19..fe214c39 100644
--- a/memxor.h
+++ b/memxor.h
@@ -5,8 +5,8 @@
 #ifndef NETTLE_MEMXOR_H_INCLUDED
 #define NETTLE_MEMXOR_H_INCLUDED
 
-#include <inttypes.h>
 #include <stdlib.h>
+#include "nettle-types.h"
 
 uint8_t *memxor(uint8_t *dst, const uint8_t *src, size_t n);
 
diff --git a/nettle-meta.h b/nettle-meta.h
index ebffd1cb..9a74cb32 100644
--- a/nettle-meta.h
+++ b/nettle-meta.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_META_H_INCLUDED
 #define NETTLE_META_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Randomness. Used by key generation and dsa signature creation. */
 typedef void (*nettle_random_func)(void *ctx,
diff --git a/pkcs1.h b/pkcs1.h
index 0db9121f..29f06284 100644
--- a/pkcs1.h
+++ b/pkcs1.h
@@ -26,8 +26,8 @@
 #ifndef NETTLE_PKCS1_H_INCLUDED
 #define NETTLE_PKCS1_H_INCLUDED
 
-#include <inttypes.h>
 #include <gmp.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define pkcs1_signature_prefix nettle_pkcs1_signature_prefix
diff --git a/realloc.h b/realloc.h
index 5e66130f..fcd4ca85 100644
--- a/realloc.h
+++ b/realloc.h
@@ -25,7 +25,7 @@
 #ifndef NETTLE_REALLOC_H_INCLUDED
 #define NETTLE_REALLOC_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 typedef void *nettle_realloc_func(void *ctx, void *p, unsigned length);
 
diff --git a/rsa.h b/rsa.h
index 39b83b11..a0df06f8 100644
--- a/rsa.h
+++ b/rsa.h
@@ -26,8 +26,8 @@
 #ifndef NETTLE_RSA_H_INCLUDED
 #define NETTLE_RSA_H_INCLUDED
 
-#include <inttypes.h>
 #include <gmp.h>
+#include "nettle-types.h"
 
 #include "md5.h"
 #include "sha.h"
diff --git a/serpent.h b/serpent.h
index 79cad0ef..4fb1d7d0 100644
--- a/serpent.h
+++ b/serpent.h
@@ -31,7 +31,7 @@
 #ifndef NETTLE_SERPENT_H_INCLUDED
 #define NETTLE_SERPENT_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define serpent_set_key nettle_serpent_set_key
diff --git a/sexp.h b/sexp.h
index 181cc576..40d4fda3 100644
--- a/sexp.h
+++ b/sexp.h
@@ -26,8 +26,8 @@
 #ifndef NETTLE_SEXP_H_INCLUDED
 #define NETTLE_SEXP_H_INCLUDED
 
-#include <inttypes.h>
 #include <stdarg.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define sexp_iterator_first nettle_sexp_iterator_first
diff --git a/sha.h b/sha.h
index 134de1d5..81e1571e 100644
--- a/sha.h
+++ b/sha.h
@@ -26,7 +26,7 @@
 #ifndef NETTLE_SHA_H_INCLUDED
 #define NETTLE_SHA_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define sha1_init nettle_sha1_init
diff --git a/twofish.h b/twofish.h
index 3d007d7a..9a1e9bab 100644
--- a/twofish.h
+++ b/twofish.h
@@ -32,7 +32,7 @@
 #ifndef NETTLE_TWOFISH_H_INCLUDED
 #define NETTLE_TWOFISH_H_INCLUDED
 
-#include <inttypes.h>
+#include "nettle-types.h"
 
 /* Name mangling */
 #define twofish_set_key nettle_twofish_set_key
-- 
GitLab