feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fix merge differences from this week

Browse Source
This commit is contained in:
toddouska
2013-05-22 15:50:13 -07:00
parent acaa2c02bf
commit 8df0e43384
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ctaocrypt/src/memory.c
View File

@@ -25,8 +25,6 @@
#include <cyassl/ctaocrypt/settings.h> #include <cyassl/ctaocrypt/settings.h>
/* submitted by eof */
#ifdef USE_CYASSL_MEMORY #ifdef USE_CYASSL_MEMORY
#include <cyassl/ctaocrypt/memory.h> #include <cyassl/ctaocrypt/memory.h>

1
cyassl/ctaocrypt/settings.h
View File

@@ -89,6 +89,7 @@
#ifdef MICROCHIP_PIC32 #ifdef MICROCHIP_PIC32
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define SINGLE_THREADED #define SINGLE_THREADED
#define CYASSL_USER_IO
#define NO_WRITEV #define NO_WRITEV
#define NO_DEV_RANDOM #define NO_DEV_RANDOM
#define NO_FILESYSTEM #define NO_FILESYSTEM

2
examples/client/client.c
View File

@@ -32,8 +32,6 @@
#include <cyassl/ctaocrypt/settings.h> #include <cyassl/ctaocrypt/settings.h>
#include <cyassl/ctaocrypt/settings.h>
#if !defined(CYASSL_TRACK_MEMORY) && !defined(NO_MAIN_DRIVER) #if !defined(CYASSL_TRACK_MEMORY) && !defined(NO_MAIN_DRIVER)
/* in case memory tracker wants stats */ /* in case memory tracker wants stats */
#define CYASSL_TRACK_MEMORY #define CYASSL_TRACK_MEMORY