From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 25 Nov 2013 16:16:25 +0000 (+0100)
Subject: Bug #429: Clean-up of reserved identifier violations
X-Git-Tag: v1.5.0-rc1~139^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d7699438aa1739c97b3210b033c8b65fc8a72c2;p=thirdparty%2Frrdtool-1.x.git

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 3861c8f9..17664db8 100644
--- 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 485dbdd9..0ff32a61 100644
--- 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 */