Skip to content

Commit 98cd7fe

Browse files
Merge pull request #10265 from ejohnstown/qnx-fix
Tasking Warning
2 parents 353a379 + 6f89331 commit 98cd7fe

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

wolfssl/wolfcrypt/settings.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,11 @@
349349
((defined(BUILDING_WOLFSSL) && defined(WOLFSSL_USE_OPTIONS_H)) || \
350350
(defined(BUILDING_WOLFSSL) && defined(WOLFSSL_OPTIONS_H) && \
351351
!defined(EXTERNAL_OPTS_OPENVPN)))
352-
#warning wolfssl/options.h included in compiled wolfssl library object.
352+
#if !defined(_MSC_VER) && !defined(__TASKING__)
353+
#warning wolfssl/options.h included in compiled wolfssl library object.
354+
#else
355+
#pragma message("Warning: wolfssl/options.h included in compiled wolfssl library object.")
356+
#endif
353357
#endif
354358

355359
#ifdef WOLFSSL_USER_SETTINGS
@@ -369,7 +373,11 @@
369373
* an application build -- then your application can avoid this warning by
370374
* defining WOLFSSL_NO_OPTIONS_H or WOLFSSL_CUSTOM_CONFIG as appropriate.
371375
*/
372-
#warning "No configuration for wolfSSL detected, check header order"
376+
#if !defined(_MSC_VER) && !defined(__TASKING__)
377+
#warning "No configuration for wolfSSL detected, check header order"
378+
#else
379+
#pragma message("Warning: No configuration for wolfSSL detected, check header order")
380+
#endif
373381
#endif
374382

375383
/* Ensure WOLFSSL_DEBUG_CERTS is set when DEBUG_WOLFSSL is enabled, unless

0 commit comments

Comments
 (0)