len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-10-15 09:17:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add #ifndef guards for SdkLog definition to fix conflicting definitions (#403)

Browse source
This commit is contained in:
Archit Aggarwal 2020-11-12 11:10:12 -08:00 • committed by GitHub
parent f06330768f
commit 6debf6a2c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 87 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/core_mqtt_config.h
View file

@ -56,7 +56,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
/************ End of logging configuration ****************/ /************ End of logging configuration ****************/

4
FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/demo_config.h
View file

@ -61,7 +61,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/shadow_config.h
View file

@ -53,7 +53,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/core_mqtt_config.h
View file

@ -56,7 +56,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
/************ End of logging configuration ****************/ /************ End of logging configuration ****************/

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/demo_config.h
View file

@ -61,7 +61,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/core_mqtt_config.h
View file

@ -58,7 +58,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
/************ End of logging configuration ****************/ /************ End of logging configuration ****************/

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/demo_config.h
View file

@ -59,7 +59,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/core_mqtt_config.h
View file

@ -58,7 +58,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
/************ End of logging configuration ****************/ /************ End of logging configuration ****************/

43
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/demo_config.h
View file

@ -58,7 +58,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
@ -261,13 +263,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/********************************************************************************** /**********************************************************************************
* Error checks and derived values only below here - do not edit below here. -----* * Error checks and derived values only below here - do not edit below here. -----*
**********************************************************************************/ **********************************************************************************/
/* Compile time error for some undefined configs, and provide default values /* Compile time error for some undefined configs, and provide default values
@ -277,14 +275,15 @@ extern void vLoggingPrintf( const char * pcFormatString,
#endif #endif
#ifndef democonfigCLIENT_IDENTIFIER #ifndef democonfigCLIENT_IDENTIFIER
/**
* @brief The MQTT client identifier used in this example. Each client identifier /**
* must be unique so edit as required to ensure no two clients connecting to the * @brief The MQTT client identifier used in this example. Each client identifier
* same broker use the same client identifier. Using a #define is for convenience * must be unique so edit as required to ensure no two clients connecting to the
* of demonstration only - production devices should use something unique to the * same broker use the same client identifier. Using a #define is for convenience
* device that can be read from software - such as a production serial number. * of demonstration only - production devices should use something unique to the
*/ * device that can be read from software - such as a production serial number.
#error "Please define democonfigCLIENT_IDENTIFIER in demo_config.h to something unique for this device." */
#error "Please define democonfigCLIENT_IDENTIFIER in demo_config.h to something unique for this device."
#endif #endif
@ -296,11 +295,11 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* If no username is defined, then a client certificate/key is required. */ /* If no username is defined, then a client certificate/key is required. */
#ifndef democonfigCLIENT_USERNAME #ifndef democonfigCLIENT_USERNAME
/* /*
*!!! Please note democonfigCLIENT_PRIVATE_KEY_PEM in used for *!!! Please note democonfigCLIENT_PRIVATE_KEY_PEM in used for
*!!! convenience of demonstration only. Production devices should *!!! convenience of demonstration only. Production devices should
*!!! store keys securely, such as within a secure element. *!!! store keys securely, such as within a secure element.
*/ */
#ifndef democonfigCLIENT_CERTIFICATE_PEM #ifndef democonfigCLIENT_CERTIFICATE_PEM
#error "Please define client certificate(democonfigCLIENT_CERTIFICATE_PEM) in demo_config.h." #error "Please define client certificate(democonfigCLIENT_CERTIFICATE_PEM) in demo_config.h."
@ -393,12 +392,12 @@ extern void vLoggingPrintf( const char * pcFormatString,
/** /**
* @brief Length of client identifier. * @brief Length of client identifier.
*/ */
#define democonfigCLIENT_IDENTIFIER_LENGTH ( ( uint16_t ) ( sizeof( democonfigCLIENT_IDENTIFIER ) - 1 ) ) #define democonfigCLIENT_IDENTIFIER_LENGTH ( ( uint16_t ) ( sizeof( democonfigCLIENT_IDENTIFIER ) - 1 ) )
/** /**
* @brief Length of MQTT server host name. * @brief Length of MQTT server host name.
*/ */
#define democonfigBROKER_ENDPOINT_LENGTH ( ( uint16_t ) ( sizeof( democonfigMQTT_BROKER_ENDPOINT ) - 1 ) ) #define democonfigBROKER_ENDPOINT_LENGTH ( ( uint16_t ) ( sizeof( democonfigMQTT_BROKER_ENDPOINT ) - 1 ) )
#endif /* DEMO_CONFIG_H */ #endif /* DEMO_CONFIG_H */

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/core_mqtt_config.h
View file

@ -56,7 +56,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
/************ End of logging configuration ****************/ /************ End of logging configuration ****************/

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/demo_config.h
View file

@ -61,7 +61,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/core_mqtt_config.h
View file

@ -58,7 +58,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
/************ End of logging configuration ****************/ /************ End of logging configuration ****************/

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/demo_config.h
View file

@ -59,7 +59,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/core_mqtt_config.h
View file

@ -58,7 +58,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
/************ End of logging configuration ****************/ /************ End of logging configuration ****************/

4
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/demo_config.h
View file

@ -59,7 +59,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/core_mqtt_config.h
View file

@ -56,7 +56,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"
/************ End of logging configuration ****************/ /************ End of logging configuration ****************/

4
FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/core_pkcs11_config.h
View file

@ -65,7 +65,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/demo_config.h
View file

@ -61,7 +61,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/core_pkcs11_config.h
View file

@ -65,7 +65,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/sockets_wrapper.h
View file

@ -62,7 +62,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.h
View file

@ -57,7 +57,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.h
View file

@ -60,7 +60,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"

4
FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.h
View file

@ -52,7 +52,9 @@ extern void vLoggingPrintf( const char * pcFormatString,
/* Map the SdkLog macro to the logging function to enable logging /* Map the SdkLog macro to the logging function to enable logging
* on Windows simulator. */ * on Windows simulator. */
#define SdkLog( message ) vLoggingPrintf message #ifndef SdkLog
#define SdkLog( message ) vLoggingPrintf message
#endif
#include "logging_stack.h" #include "logging_stack.h"