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

Merge branch 'test' of github.com:urbit/urbit into test

Browse Source
This commit is contained in:
Galen Wolfe-Pauly 2015-09-10 21:26:58 -07:00
commit 213e1f727c
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -71,9 +71,9 @@ INCLUDE=include
MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\" 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..

6
README.markdown → README.md
View File

@ -208,5 +208,7 @@ pier. Your original ticket will still work.
Contributing Contributing
------------ ------------
If you're interested in contributing to urbit development come and The first step in contributing to urbit is to come and join us on `:talk`.
`:talk` with us. We'll help you get oriented and up to speed.
For more detailed instructions check out
[`contributing.md`](https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md),.

2
debian/docs vendored
View File

@ -1 +1 @@
README.markdown README.md

4
noun/manage.c
View File

@ -593,12 +593,12 @@ u3m_bail(u3_noun how)
str_c[2] = ((how >> 16) & 0xff); str_c[2] = ((how >> 16) & 0xff);
str_c[3] = ((how >> 24) & 0xff); str_c[3] = ((how >> 24) & 0xff);
str_c[4] = 0; str_c[4] = 0;
fprintf(stderr, "bail: %s\r\n", str_c); fprintf(stderr, "\r\nbail: %s\r\n", str_c);
} }
else { else {
c3_assert(_(u3ud(u3h(how)))); c3_assert(_(u3ud(u3h(how))));
fprintf(stderr, "bail: %d\r\n", u3h(how)); fprintf(stderr, "\r\nbail: %d\r\n", u3h(how));
u3m_p("bail", u3t(how)); u3m_p("bail", u3t(how));
} }
} }

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,