From 2bb098c1eda90cd30e68399ac4254b566294d383 Mon Sep 17 00:00:00 2001 From: Kingdon Date: Thu, 10 Sep 2015 00:56:36 -0400 Subject: [PATCH] patchset --- Makefile | 3 ++- outside/scrypt/crypto_scrypt.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 014516e39..58a8ec34a 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\" # NOTFORCHECKIN - restore -O3 # -DGHETTO \ # -DHUSH -CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \ +CFLAGS= $(COSFLAGS) -O3 -ffast-math \ -funsigned-char \ -I/usr/local/include \ -I/opt/local/include \ @@ -473,6 +473,7 @@ debinstall: clean: $(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES) + $(RM) -r debian/files debian/urbit* # 'make distclean all -jn' ∀ n>1 still does not work because it is possible # Make will attempt to build urbit while it is also cleaning urbit.. diff --git a/outside/scrypt/crypto_scrypt.h b/outside/scrypt/crypto_scrypt.h index e2638c5f3..39cad5c5b 100644 --- a/outside/scrypt/crypto_scrypt.h +++ b/outside/scrypt/crypto_scrypt.h @@ -30,7 +30,6 @@ #define _CRYPTO_SCRYPT_H_ #include -#include void smix(uint8_t *, size_t, uint64_t, uint32_t *, uint32_t *); void PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,