Skip to content

Commit 45b8804

Browse files
make macro unique to wolfSSL
1 parent 4893017 commit 45b8804

6 files changed

Lines changed: 12 additions & 11 deletions

File tree

IDE/NDS/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ ./configure \
1818
LDFLAGS="-L/opt/devkitpro/libnds/lib" \
1919
--prefix=$DEVKITPRO/portlibs/nds \
2020
CFLAGS="-march=armv5te -mtune=arm946e-s \
21-
--specs=ds_arm9.specs -DARM9 -DNDS \
21+
--specs=ds_arm9.specs -DARM9 -DWOLFSSL_NDS \
2222
-DWOLFSSL_USER_IO \
2323
-I$DEVKITPRO/libnds/include" \
2424
--enable-fastmath --disable-benchmark \

wolfcrypt/src/random.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3817,7 +3817,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
38173817
return ret;
38183818
}
38193819

3820-
#elif defined(DOLPHIN_EMULATOR) || defined (NDS)
3820+
#elif defined(DOLPHIN_EMULATOR) || defined (WOLFSSL_NDS)
38213821

38223822
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
38233823
{

wolfcrypt/test/test.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ const byte const_byte_array[] = "A+Gd\0\0\0";
429429
#ifdef DEVKITPRO
430430
#include <wiiuse/wpad.h>
431431
#endif
432-
#ifdef NDS
432+
#ifdef WOLFSSL_NDS
433433
#include <nds/ndstypes.h>
434434
#include <nds/arm9/console.h>
435435
#include <nds/arm9/input.h>
@@ -2473,7 +2473,7 @@ options: [-s max_relative_stack_bytes] [-m max_relative_heap_memory_bytes]\n\
24732473
VIDEO_WaitVSync();
24742474
if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
24752475
#endif
2476-
#ifdef NDS
2476+
#ifdef WOLFSSL_NDS
24772477
/* Init Console output */
24782478
consoleDemoInit();
24792479

@@ -2525,7 +2525,7 @@ options: [-s max_relative_stack_bytes] [-m max_relative_heap_memory_bytes]\n\
25252525
while (1);
25262526
#endif
25272527

2528-
#ifdef NDS
2528+
#ifdef WOLFSSL_NDS
25292529
/* in Nintendo DS returning from main shuts down the Device without letting you see the Results. */
25302530
printf("args.return_code: %d\n", args.return_code);
25312531
printf("Testing complete. Press Start to exit the Program\n");
@@ -18109,7 +18109,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t memory_test(void)
1810918109
#elif defined(_WIN32_WCE)
1811018110
#define CERT_PREFIX "\\windows\\"
1811118111
#define CERT_PATH_SEP "\\"
18112-
#elif defined(NDS)
18112+
#elif defined(WOLFSSL_NDS)
1811318113
#undef CERT_PREFIX
1811418114
#define CERT_PREFIX "fat:/_nds/"
1811518115
#define CERT_PATH_SEP "/"

wolfssl/ssl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3164,7 +3164,8 @@ WOLFSSL_API int wolfSSL_make_eap_keys(WOLFSSL* ssl, void* key, unsigned int len,
31643164
!defined(WOLFSSL_PICOTCP) && !defined(WOLFSSL_ROWLEY_ARM) && \
31653165
!defined(WOLFSSL_EMBOS) && !defined(WOLFSSL_FROSTED) && \
31663166
!defined(WOLFSSL_CHIBIOS) && !defined(WOLFSSL_CONTIKI) && \
3167-
!defined(WOLFSSL_ZEPHYR) && !defined(NETOS) && !defined(NDS)
3167+
!defined(WOLFSSL_ZEPHYR) && !defined(NETOS) && \
3168+
!defined(WOLFSSL_NDS)
31683169
#include <sys/uio.h>
31693170
#endif
31703171
/* allow writev style writing */

wolfssl/test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
#include <netinet/in.h>
204204
#include <netinet/tcp.h>
205205
#include <arpa/inet.h>
206-
#ifndef NDS
206+
#ifndef WOLFSSL_NDS
207207
#include <sys/ioctl.h>
208208
#endif
209209
#include <sys/time.h>

wolfssl/wolfcrypt/settings.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@
262262
/* Uncomment next line if building for Dolphin Emulator */
263263
/* #define DOLPHIN_EMULATOR */
264264

265-
/* Uncomment next line if building for NDS */
266-
/* #define NDS */
265+
/* Uncomment next line if building for WOLFSSL_NDS */
266+
/* #define WOLFSSL_NDS */
267267

268268
/* Uncomment next line if using MAXQ1065 */
269269
/* #define WOLFSSL_MAXQ1065 */
@@ -474,7 +474,7 @@
474474
#endif
475475

476476

477-
#ifdef NDS
477+
#ifdef WOLFSSL_NDS
478478
#include <stddef.h>
479479
#define SIZEOF_LONG_LONG 8
480480
#define socklen_t int

0 commit comments

Comments
 (0)