From 71d944a5d0d6d6fa7d0a899cc7a1d68af239da19 Mon Sep 17 00:00:00 2001 From: Stefan Kolb Date: Thu, 3 Sep 2015 07:00:39 -0600 Subject: [PATCH] Macros PR_BEGIN_EXTERN_C and PR_END_EXTERN_C were not defined in all contexts. Remove definition and replace with explicit expansion. From Stefan Kolb --- ChangeLog.txt | 4 +++- include/modbus/mb.h | 5 +++-- include/modbus/mb_m.h | 5 +++-- include/modbus/mbframe.h | 5 +++-- include/modbus/mbfunc.h | 5 +++-- include/modbus/mbport.h | 5 +++-- include/modbus/mbproto.h | 5 +++-- include/modbus/mbutils.h | 5 +++-- modbus/ascii/mbascii.h | 5 +++-- modbus/nuttx/port.h | 11 +++++------ modbus/rtu/mbrtu.h | 5 +++-- modbus/tcp/mbtcp.h | 5 +++-- 12 files changed, 38 insertions(+), 27 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 008cba728..ba5f5ce40 100755 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1425,4 +1425,6 @@ first path was not being freed. From Bruno Herrera (2015-08-26). * apps/examples/netloop: Add a test of the local loopback device (2015-09-02). - + * apps/modbus and apps/include/modbus: Macros PR_BEGIN_EXTERN_C and + PR_END_EXTERN_C were not defined in all contexts. Replace with + explicit expansion in all cases. From Stefan Kolb (2015-09-03). diff --git a/include/modbus/mb.h b/include/modbus/mb.h index cf1e867bb..c83caad16 100644 --- a/include/modbus/mb.h +++ b/include/modbus/mb.h @@ -65,7 +65,8 @@ #include #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif #include "mbport.h" @@ -431,6 +432,6 @@ eMBErrorCode eMBRegDiscreteCB(uint8_t *pucRegBuffer, uint16_t usAddress, uint16_t usNDiscrete); #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif diff --git a/include/modbus/mb_m.h b/include/modbus/mb_m.h index 3723b0edd..491c1b06d 100644 --- a/include/modbus/mb_m.h +++ b/include/modbus/mb_m.h @@ -67,7 +67,8 @@ #include #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif #include "mbport.h" @@ -459,7 +460,7 @@ void vMBMasterSetErrorType(eMBMasterErrorEventType errorType); eMBMasterReqErrCode eMBMasterWaitRequestFinish(void); #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_INCLUDE_MODBUS_MB_M_H */ diff --git a/include/modbus/mbframe.h b/include/modbus/mbframe.h index 01014989d..40312ff51 100644 --- a/include/modbus/mbframe.h +++ b/include/modbus/mbframe.h @@ -33,7 +33,8 @@ #define __APPS_INCLUDE_MODBUS_MBFRAME_H #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif /**************************************************************************** @@ -84,7 +85,7 @@ typedef eMBErrorCode (*peMBFrameSend)(uint8_t slaveAddress, typedef void (*pvMBFrameClose)(void); #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_INCLUDE_MODBUS_MBFRAME_H */ diff --git a/include/modbus/mbfunc.h b/include/modbus/mbfunc.h index 7cecd8fc8..82f4ee8cc 100644 --- a/include/modbus/mbfunc.h +++ b/include/modbus/mbfunc.h @@ -33,7 +33,8 @@ #define __APPS_INCLUDE_MODBUS_MBFUNC_H #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif /**************************************************************************** @@ -81,7 +82,7 @@ eMBException eMBFuncReadWriteMultipleHoldingRegister(uint8_t *pucFrame, uint16_t #endif #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_INCLUDE_MODBUS_MBFUNC_H */ diff --git a/include/modbus/mbport.h b/include/modbus/mbport.h index 7a811a97b..d1d4bc500 100644 --- a/include/modbus/mbport.h +++ b/include/modbus/mbport.h @@ -44,7 +44,8 @@ ****************************************************************************/ #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif typedef enum @@ -185,7 +186,7 @@ bool xMBTCPPortSendResponse(const uint8_t *pucMBTCPFrame, uint16_t usTCPLength); #endif #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_INCLUDE_MODBUS_MBPORT_H */ diff --git a/include/modbus/mbproto.h b/include/modbus/mbproto.h index f61e858e5..e42e7a284 100644 --- a/include/modbus/mbproto.h +++ b/include/modbus/mbproto.h @@ -33,7 +33,8 @@ #define __APPS_INCLUDE_MODBUS_MBPROTO_H #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif /**************************************************************************** @@ -87,7 +88,7 @@ typedef struct } xMBFunctionHandler; #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_INCLUDE_MODBUS_MBPROTO_H */ diff --git a/include/modbus/mbutils.h b/include/modbus/mbutils.h index fbeba53dc..1bb33c53c 100644 --- a/include/modbus/mbutils.h +++ b/include/modbus/mbutils.h @@ -33,7 +33,8 @@ #define __APPS_INCLUDE_MODBUS_MBUTILS_H #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif /**************************************************************************** @@ -104,7 +105,7 @@ void xMBUtilSetBits(uint8_t *ucByteBuf, uint16_t usBitOffset, uint8_t xMBUtilGetBits(uint8_t *ucByteBuf, uint16_t usBitOffset, uint8_t ucNBits); #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_INCLUDE_MODBUS_MBUTILS_H */ diff --git a/modbus/ascii/mbascii.h b/modbus/ascii/mbascii.h index f4c901a4b..63064506f 100644 --- a/modbus/ascii/mbascii.h +++ b/modbus/ascii/mbascii.h @@ -33,7 +33,8 @@ #define __APPS_MODBUS_ASCII_MBASCII_H #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif /**************************************************************************** @@ -55,7 +56,7 @@ bool xMBASCIITimerT1SExpired(void); #endif #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_MODBUS_ASCII_MBASCII_H */ diff --git a/modbus/nuttx/port.h b/modbus/nuttx/port.h index 5b7416873..f4b6e11be 100644 --- a/modbus/nuttx/port.h +++ b/modbus/nuttx/port.h @@ -44,14 +44,13 @@ * Pre-processor Definitions ****************************************************************************/ -#define INLINE -#define PR_BEGIN_EXTERN_C extern "C" { -#define PR_END_EXTERN_C } - #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif +#define INLINE + #define ENTER_CRITICAL_SECTION( ) vMBPortEnterCritical() #define EXIT_CRITICAL_SECTION( ) vMBPortExitCritical() @@ -88,7 +87,7 @@ bool xMBPortSerialPoll(void); bool xMBPortSerialSetTimeout(uint32_t dwTimeoutMs); #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_MODBUS_NUTTX_PORT_H */ diff --git a/modbus/rtu/mbrtu.h b/modbus/rtu/mbrtu.h index 7187d8aec..7d13abff3 100644 --- a/modbus/rtu/mbrtu.h +++ b/modbus/rtu/mbrtu.h @@ -33,7 +33,8 @@ #define __APPS_MODBUS_RTU_MBRTU_H #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif /**************************************************************************** @@ -68,7 +69,7 @@ bool xMBMasterRTUTimerExpired(void); #endif #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_MODBUS_RTU_MBRTU_H */ diff --git a/modbus/tcp/mbtcp.h b/modbus/tcp/mbtcp.h index c45720013..b44de01f1 100644 --- a/modbus/tcp/mbtcp.h +++ b/modbus/tcp/mbtcp.h @@ -33,7 +33,8 @@ #define __APPS_MODBUS_TCP_MBTCP_H #ifdef __cplusplus -PR_BEGIN_EXTERN_C +extern "C" +{ #endif /**************************************************************************** @@ -55,7 +56,7 @@ eMBErrorCode eMBTCPSend(uint8_t _unused, const uint8_t *pucFrame, uint16_t usLength); #ifdef __cplusplus -PR_END_EXTERN_C +} #endif #endif /* __APPS_MODBUS_TCP_MBTCP_H */