Commit 3185ed4d authored by Niels Möller's avatar Niels Möller

Merge branch 'delete-nettle-stdint-h' into master

parents fbc93be6 b5954ea7
...@@ -31,7 +31,6 @@ core ...@@ -31,7 +31,6 @@ core
/autom4te.cache /autom4te.cache
/stamp-h /stamp-h
/stamp-h.in /stamp-h.in
/nettle-stdint.h
/*.pc /*.pc
/machine.m4 /machine.m4
/aesdata /aesdata
......
...@@ -38,6 +38,16 @@ ...@@ -38,6 +38,16 @@
* testsuite/rsa-compute-root-test.c (generate_keypair): Fix assert * testsuite/rsa-compute-root-test.c (generate_keypair): Fix assert
call with side-effects. call with side-effects.
2019-01-06 Niels Möller <nisse@lysator.liu.se>
* nettle-types.h: Don't use nettle-stdint.h, include <stdint.h>
directly.
* nettle-write.h: Likewise.
* configure.ac: Delete use of AX_CREATE_STDINT_H.
* aclocal.m4 (AX_CREATE_STDINT_H): Delete.
* Makefile.in (INSTALL_HEADERS, distclean-here): Delete mention of
nettle-stdint.h.
2018-12-26 Niels Möller <nisse@lysator.liu.se> 2018-12-26 Niels Möller <nisse@lysator.liu.se>
* examples/hogweed-benchmark.c (make_openssl_rsa_ctx): New helper * examples/hogweed-benchmark.c (make_openssl_rsa_ctx): New helper
......
...@@ -208,7 +208,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.h blowfish.h \ ...@@ -208,7 +208,7 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.h blowfish.h \
serpent.h sha.h sha1.h sha2.h sha3.h twofish.h \ serpent.h sha.h sha1.h sha2.h sha3.h twofish.h \
umac.h yarrow.h poly1305.h umac.h yarrow.h poly1305.h
INSTALL_HEADERS = $(HEADERS) nettle-stdint.h version.h @IF_MINI_GMP@ mini-gmp.h INSTALL_HEADERS = $(HEADERS) version.h @IF_MINI_GMP@ mini-gmp.h
SOURCES = $(nettle_SOURCES) $(hogweed_SOURCES) \ SOURCES = $(nettle_SOURCES) $(hogweed_SOURCES) \
$(getopt_SOURCES) $(internal_SOURCES) \ $(getopt_SOURCES) $(internal_SOURCES) \
...@@ -655,7 +655,7 @@ clean-here: ...@@ -655,7 +655,7 @@ clean-here:
distclean-here: clean-here distclean-here: clean-here
-rm -f config.h stamp-h config.log config.status machine.m4 \ -rm -f config.h stamp-h config.log config.status machine.m4 \
config.make config.m4 Makefile nettle-stdint.h version.h \ config.make config.m4 Makefile version.h \
nettle.pc hogweed.pc libnettle.map libhogweed.map \ nettle.pc hogweed.pc libnettle.map libhogweed.map \
*.asm *.d *.asm *.d
......
This diff is collapsed.
...@@ -229,10 +229,6 @@ fi ...@@ -229,10 +229,6 @@ fi
LSH_GCC_ATTRIBUTES LSH_GCC_ATTRIBUTES
# According to Simon Josefsson, looking for uint32_t and friends in
# sys/types.h is needed on some systems, in particular cygwin.
AX_CREATE_STDINT_H([nettle-stdint.h], [sys/types.h])
# Check for file locking. We (AC_PROG_CC?) have already checked for # Check for file locking. We (AC_PROG_CC?) have already checked for
# sys/types.h and unistd.h. # sys/types.h and unistd.h.
AC_CACHE_CHECK([for fcntl file locking], AC_CACHE_CHECK([for fcntl file locking],
......
...@@ -34,10 +34,7 @@ ...@@ -34,10 +34,7 @@
/* For size_t */ /* For size_t */
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
/* Pretend these types always exists. Nettle doesn't use them. */
#define _STDINT_HAVE_INT_FAST32_T 1
#include "nettle-stdint.h"
/* Attributes we want to use in installed header files, and hence /* Attributes we want to use in installed header files, and hence
can't rely on config.h. */ can't rely on config.h. */
......
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
/* For size_t */ /* For size_t */
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
#include "nettle-stdint.h"
/* Write the word array at SRC to the byte array at DST, using little /* Write the word array at SRC to the byte array at DST, using little
endian (le) or big endian (be) byte order, and truncating the endian (le) or big endian (be) byte order, and truncating the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment