Don't use reserved names in header guards.

Closes #3.
eclipse · Mar 13, 2016 · 556c629 · 556c629
1 parent 6c8c649
commit 556c629
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 32 deletions.
diff --git a/client/client_shared.h b/client/client_shared.h
@@ -14,8 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#ifndef _CLIENT_CONFIG_H
-#define _CLIENT_CONFIG_H
+#ifndef CLIENT_CONFIG_H
+#define CLIENT_CONFIG_H
 
 #include <stdio.h>
 

diff --git a/lib/dummypthread.h b/lib/dummypthread.h
@@ -1,5 +1,5 @@
-#ifndef _DUMMYPTHREAD_H_
-#define _DUMMYPTHREAD_H_
+#ifndef DUMMYPTHREAD_H
+#define DUMMYPTHREAD_H
 
 #define pthread_create(A, B, C, D)
 #define pthread_join(A, B)

diff --git a/lib/logging_mosq.h b/lib/logging_mosq.h
@@ -13,8 +13,8 @@ and the Eclipse Distribution License is available at
 Contributors:
  Roger Light - initial implementation and documentation.
 */
-#ifndef _LOGGING_MOSQ_H_
-#define _LOGGING_MOSQ_H_
+#ifndef LOGGING_MOSQ_H
+#define LOGGING_MOSQ_H
 
 #include "mosquitto.h"
 

diff --git a/lib/memory_mosq.h b/lib/memory_mosq.h
@@ -14,8 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#ifndef _MEMORY_MOSQ_H_
-#define _MEMORY_MOSQ_H_
+#ifndef MEMORY_MOSQ_H
+#define MEMORY_MOSQ_H
 
 #include <stdio.h>
 #include <sys/types.h>

diff --git a/lib/messages_mosq.h b/lib/messages_mosq.h
@@ -13,8 +13,8 @@ and the Eclipse Distribution License is available at
 Contributors:
  Roger Light - initial implementation and documentation.
 */
-#ifndef _MESSAGES_MOSQ_H_
-#define _MESSAGES_MOSQ_H_
+#ifndef MESSAGES_MOSQ_H
+#define MESSAGES_MOSQ_H
 
 #include "mosquitto_internal.h"
 #include "mosquitto.h"

diff --git a/lib/mosquitto.h b/lib/mosquitto.h
@@ -14,8 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#ifndef _MOSQUITTO_H_
-#define _MOSQUITTO_H_
+#ifndef MOSQUITTO_H
+#define MOSQUITTO_H
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
@@ -14,8 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#ifndef _MOSQUITTO_INTERNAL_H_
-#define _MOSQUITTO_INTERNAL_H_
+#ifndef MOSQUITTO_INTERNAL_H
+#define MOSQUITTO_INTERNAL_H
 
 #include "config.h"
 

diff --git a/lib/mqtt3_protocol.h b/lib/mqtt3_protocol.h
@@ -14,8 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#ifndef _MQTT3_PROTOCOL_H_
-#define _MQTT3_PROTOCOL_H_
+#ifndef MQTT3_PROTOCOL_H
+#define MQTT3_PROTOCOL_H
 
 /* For version 3 of the MQTT protocol */
 

diff --git a/lib/net_mosq.h b/lib/net_mosq.h
@@ -13,8 +13,8 @@ and the Eclipse Distribution License is available at
 Contributors:
  Roger Light - initial implementation and documentation.
 */
-#ifndef _NET_MOSQ_H_
-#define _NET_MOSQ_H_
+#ifndef NET_MOSQ_H
+#define NET_MOSQ_H
 
 #ifndef WIN32
 #include <unistd.h>

diff --git a/lib/packet_mosq.h b/lib/packet_mosq.h
@@ -13,8 +13,8 @@ and the Eclipse Distribution License is available at
 Contributors:
  Roger Light - initial implementation and documentation.
 */
-#ifndef _PACKET_MOSQ_H_
-#define _PACKET_MOSQ_H_
+#ifndef PACKET_MOSQ_H
+#define PACKET_MOSQ_H
 
 #include "mosquitto_internal.h"
 #include "mosquitto.h"

diff --git a/lib/read_handle.h b/lib/read_handle.h
@@ -13,8 +13,8 @@ and the Eclipse Distribution License is available at
 Contributors:
  Roger Light - initial implementation and documentation.
 */
-#ifndef _READ_HANDLE_H_
-#define _READ_HANDLE_H_
+#ifndef READ_HANDLE_H
+#define READ_HANDLE_H
 
 #include "mosquitto.h"
 struct mosquitto_db;

diff --git a/lib/send_mosq.h b/lib/send_mosq.h
@@ -13,8 +13,8 @@ and the Eclipse Distribution License is available at
 Contributors:
  Roger Light - initial implementation and documentation.
 */
-#ifndef _SEND_MOSQ_H_
-#define _SEND_MOSQ_H_
+#ifndef SEND_MOSQ_H
+#define SEND_MOSQ_H
 
 #include "mosquitto.h"
 

diff --git a/lib/time_mosq.h b/lib/time_mosq.h
@@ -14,8 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#ifndef _TIME_MOSQ_H_
-#define _TIME_MOSQ_H_
+#ifndef TIME_MOSQ_H
+#define TIME_MOSQ_H
 
 time_t mosquitto_time(void);
 

diff --git a/lib/tls_mosq.h b/lib/tls_mosq.h
@@ -14,8 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#ifndef _TLS_MOSQ_H_
-#define _TLS_MOSQ_H_
+#ifndef TLS_MOSQ_H
+#define TLS_MOSQ_H
 
 #ifdef WITH_TLS
 # define SSL_DATA_PENDING(A) ((A)->ssl && SSL_pending((A)->ssl))

diff --git a/lib/util_mosq.h b/lib/util_mosq.h
@@ -13,8 +13,8 @@ and the Eclipse Distribution License is available at
 Contributors:
  Roger Light - initial implementation and documentation.
 */
-#ifndef _UTIL_MOSQ_H_
-#define _UTIL_MOSQ_H_
+#ifndef UTIL_MOSQ_H
+#define UTIL_MOSQ_H
 
 #include <stdio.h>
 

diff --git a/lib/will_mosq.h b/lib/will_mosq.h
@@ -14,8 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#ifndef _WILL_MOSQ_H_
-#define _WILL_MOSQ_H_
+#ifndef WILL_MOSQ_H
+#define WILL_MOSQ_H
 
 #include "mosquitto.h"
 #include "mosquitto_internal.h"