Skip to content
Browse files

Various platform specific bugs and new nacl with more plans.

  • Loading branch information...
1 parent e793641 commit 523213606d095dbbc4dcc7a057e557ea86deb060 Caleb James DeLisle committed Nov 4, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −0 admin/AdminClient.c
  2. +1 −1 cmake/modules/FindNACL.cmake
  3. +1 −1 util/Bits.h
  4. +1 −1 util/Process_Illumos.c
View
1 admin/AdminClient.c
@@ -27,6 +27,7 @@
#include <crypto_hash_sha256.h>
#include <unistd.h>
#include <event2/event.h>
+#include <netinet/in.h> // sizeof(struct sockaddr_in) on freebsd
struct AdminClient
View
2 cmake/modules/FindNACL.cmake
@@ -51,7 +51,7 @@ if(NOT NACL_FOUND)
include_directories(${NACL_USE_FILES})
# the name of the tag
- set(tag "e58f2c403197b15de39a68c2248b8badb75801ef.tar.gz")
+ set(tag "c40b0e706cbb02126a2c3f53a2fb9c893525fadd.tar.gz")
# Configure cnacl
set(cNaClConfig "
View
2 util/Bits.h
@@ -150,7 +150,7 @@ static inline void* Bits_memcpyDebug(void* out,
Bits_memcpy(a, b, c)
#define Bits_memmoveConst(a,b,c) \
- Assert_compileTime(__builtin_constant_p(c)); \
+ Assert_compileTime(__builtin_constant_p(c) == 1); \
Bits_memmove(a,b,c)
#else
#define Bits_memcpyConst(a, b, c) Bits_memcpy(a, b, c)
View
2 util/Process_Illumos.c
@@ -17,11 +17,11 @@
#include "memory/Allocator.h"
#include "memory/MallocAllocator.h"
+#include "util/platform/libc/strlen.h"
#include "util/Process.h"
#include "util/Bits.h"
#include <stdint.h>
-#include "util/platform/libc/string.h"
#include <unistd.h>
int Process_spawn(char* binaryPath, char** args)

0 comments on commit 5232136

Please sign in to comment.
Something went wrong with that request. Please try again.