Avoid to use reserved identifiers for header names (closes #157)

https://www.securecoding.cert.org/confluence/display/seccode/DCL37-C.+Do+not+declare+or+define+a+reserved+identifier
Not applied to libmodbus constants for now...

src/modbus-private.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _MODBUS_PRIVATE_H_
-#define _MODBUS_PRIVATE_H_
+#ifndef MODBUS_PRIVATE_H
+#define MODBUS_PRIVATE_H
 
 #ifndef _MSC_VER
 # include <stdint.h>
@@ -124,4 +124,4 @@ size_t strlcpy(char *dest, const char *src, size_t dest_size);
 
 MODBUS_END_DECLS
 
-#endif  /* _MODBUS_PRIVATE_H_ */
+#endif  /* MODBUS_PRIVATE_H */

src/modbus-rtu-private.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _MODBUS_RTU_PRIVATE_H_
-#define _MODBUS_RTU_PRIVATE_H_
+#ifndef MODBUS_RTU_PRIVATE_H
+#define MODBUS_RTU_PRIVATE_H
 
 #ifndef _MSC_VER
 #include <stdint.h>
@@ -87,4 +87,4 @@ typedef struct _modbus_rtu {
     int confirmation_to_ignore;
 } modbus_rtu_t;
 
-#endif /* _MODBUS_RTU_PRIVATE_H_ */
+#endif /* MODBUS_RTU_PRIVATE_H */

src/modbus-rtu.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _MODBUS_RTU_H_
-#define _MODBUS_RTU_H_
+#ifndef MODBUS_RTU_H
+#define MODBUS_RTU_H
 
 #include "modbus.h"
 
@@ -46,4 +46,4 @@ MODBUS_API int modbus_rtu_get_rts(modbus_t *ctx);
 
 MODBUS_END_DECLS
 
-#endif /* _MODBUS_RTU_H_ */
+#endif /* MODBUS_RTU_H */

src/modbus-tcp-private.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _MODBUS_TCP_PRIVATE_H_
-#define _MODBUS_TCP_PRIVATE_H_
+#ifndef MODBUS_TCP_PRIVATE_H
+#define MODBUS_TCP_PRIVATE_H
 
 #define _MODBUS_TCP_HEADER_LENGTH      7
 #define _MODBUS_TCP_PRESET_REQ_LENGTH 12
@@ -53,4 +53,4 @@ typedef struct _modbus_tcp_pi {
     char service[_MODBUS_TCP_PI_SERVICE_LENGTH];
 } modbus_tcp_pi_t;
 
-#endif /* _MODBUS_TCP_PRIVATE_H_ */
+#endif /* MODBUS_TCP_PRIVATE_H */

src/modbus-tcp.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _MODBUS_TCP_H_
-#define _MODBUS_TCP_H_
+#ifndef MODBUS_TCP_H
+#define MODBUS_TCP_H
 
 #include "modbus.h"
 
@@ -61,4 +61,4 @@ MODBUS_API int modbus_tcp_pi_accept(modbus_t *ctx, int *s);
 
 MODBUS_END_DECLS
 
-#endif /* _MODBUS_TCP_H_ */
+#endif /* MODBUS_TCP_H */

src/modbus-version.h.in

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MODBUS_VERSION_H_
-#define _MODBUS_VERSION_H_
+#ifndef MODBUS_VERSION_H
+#define MODBUS_VERSION_H
 
 /* The major version, (1, if %LIBMODBUS_VERSION is 1.2.3) */
 #define LIBMODBUS_VERSION_MAJOR (@LIBMODBUS_VERSION_MAJOR@)
@@ -49,4 +49,4 @@
       LIBMODBUS_VERSION_MINOR == (minor) &&             \
       LIBMODBUS_VERSION_MICRO >= (micro)))
 
-#endif /* _MODBUS_VERSION_H_ */
+#endif /* MODBUS_VERSION_H */

src/modbus.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _MODBUS_H_
-#define _MODBUS_H_
+#ifndef MODBUS_H
+#define MODBUS_H
 
 /* Add this for macros that defined unix flavor */
 #if (defined(__unix__) || defined(unix)) && !defined(USG)
@@ -248,4 +248,4 @@ MODBUS_API void modbus_set_float_dcba(float f, uint16_t *dest);
 
 MODBUS_END_DECLS
 
-#endif  /* _MODBUS_H_ */
+#endif  /* MODBUS_H */