ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 20:31:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'yebyen-patchset' into test

Browse Source
This commit is contained in:
Raymond Pasco 2015-09-10 18:00:37 -04:00
commit 99b1a4ef44
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -73,7 +73,7 @@ MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
# NOTFORCHECKIN - restore -O3 # NOTFORCHECKIN - restore -O3
# -DGHETTO \ # -DGHETTO \
# -DHUSH # -DHUSH
CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \ CFLAGS= $(COSFLAGS) -O3 -ffast-math \
-funsigned-char \ -funsigned-char \
-I/usr/local/include \ -I/usr/local/include \
-I/opt/local/include \ -I/opt/local/include \
@ -473,6 +473,7 @@ debinstall:
clean: clean:
$(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES) $(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 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.. # Make will attempt to build urbit while it is also cleaning urbit..

1
outside/scrypt/crypto_scrypt.h
View File

@ -30,7 +30,6 @@
#define _CRYPTO_SCRYPT_H_ #define _CRYPTO_SCRYPT_H_
#include <stdint.h> #include <stdint.h>
#include <emmintrin.h>
void smix(uint8_t *, size_t, uint64_t, uint32_t *, uint32_t *); 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, void PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,