Bug #429: Clean-up of reserved identifier violations

A few identifiers did not fit to the expected naming convention of the
C++ language standard. This detail was fixed by the deletion of an underscore.
The probability for name clashes was reduced for the affected include guards
by the addition of a kind of universally unique identifier as a suffix.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

diff --git a/src/mutex.h b/src/mutex.h
index 3861c8f952257b8a4c3b1379fb0a0d72f6e4bb96..17664db8c5d76b06e330685179150847316484ee 100644 (file)
--- a/src/mutex.h
+++ b/src/mutex.h
@@ -2,8 +2,8 @@
  *  mutex.h - Cross platform mutex
  */
 
-#ifndef MUTEX__H
-#define MUTEX__H
+#ifndef MUTEX_H_B13C67AB432C4C39AF823A339537CA40
+#define MUTEX_H_B13C67AB432C4C39AF823A339537CA40
 
 #ifdef WIN32
 #include <windows.h>

diff --git a/src/strftime.h b/src/strftime.h
index 485dbdd933148948d389aa7cd8892c99b19290e8..0ff32a61befef9bb8d16d8186b0552e642f60a92 100644 (file)
--- a/src/strftime.h
+++ b/src/strftime.h
@@ -5,8 +5,8 @@
 **         strftime_() is used.
 */
 
-#ifndef STRFTIME__H
-#define STRFTIME__H
+#ifndef STRFTIME_H_14FA27AFAACA4FB5820D2B15278D9B96
+#define STRFTIME_H_14FA27AFAACA4FB5820D2B15278D9B96
 
 #include <stddef.h>     /* for size_t */
 #include <time.h>       /* for struct tm */