From 78c87529f7f333c2cce73ec27efc01557fe70b56 Mon Sep 17 00:00:00 2001 From: Jaehong Jo Date: Fri, 26 Feb 2016 10:31:26 +0900 Subject: [PATCH] Prevent macro error Change-Id: I8a08cf76a18663b6086a5aa84779587c3049b0b1 error: macro names must be identifiers Signed-off-by: Jaehong Jo Reviewed-on: https://gerrit.iotivity.org/gerrit/5207 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c | 2 ++ resource/csdk/stack/include/ocpayload.h | 4 ++++ resource/csdk/stack/include/payload_logging.h | 4 ++++ resource/csdk/stack/src/ocstack.c | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c b/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c index ae7fc4c..5c4c581 100644 --- a/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c +++ b/resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c @@ -23,7 +23,9 @@ #include #include +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif #include #include "cainterface.h" diff --git a/resource/csdk/stack/include/ocpayload.h b/resource/csdk/stack/include/ocpayload.h index b42d61f..80354f7 100755 --- a/resource/csdk/stack/include/ocpayload.h +++ b/resource/csdk/stack/include/ocpayload.h @@ -21,8 +21,12 @@ #ifndef OCPAYLOAD_H_ #define OCPAYLOAD_H_ +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif #include #include #include "octypes.h" diff --git a/resource/csdk/stack/include/payload_logging.h b/resource/csdk/stack/include/payload_logging.h index 4ce5770..6a6bb24 100644 --- a/resource/csdk/stack/include/payload_logging.h +++ b/resource/csdk/stack/include/payload_logging.h @@ -26,8 +26,12 @@ #include #endif +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif #include #include "rdpayload.h" diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index 0dda57c..b82065c 100755 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -30,8 +30,12 @@ // For POSIX.1-2001 base specification, // Refer http://pubs.opengroup.org/onlinepubs/009695399/ #define _POSIX_C_SOURCE 200112L +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif #include #include #include -- 2.7.4