Consistent header macros everywhere

7 files changed, 34 insertions, 3 deletions

diff --git a/src/common/chanopt.h b/src/common/chanopt.h
index d36b7cc3..c0990385 100644
--- a/src/common/chanopt.h
+++ b/src/common/chanopt.h
@@ -17,9 +17,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef HEXCHAT_CHANOPT_H
+#define HEXCHAT_CHANOPT_H
+
 int chanopt_command (session *sess, char *tbuf, char *word[], char *word_eol[]);
 gboolean chanopt_is_set (unsigned int global, guint8 per_chan_setting);
 gboolean chanopt_is_set_a (unsigned int global, guint8 per_chan_setting);
 void chanopt_save_all (void);
 void chanopt_save (session *sess);
 void chanopt_load (session *sess);
+
+#endif
diff --git a/src/common/identd.h b/src/common/identd.h
index 4e5049d5..3b29135f 100644
--- a/src/common/identd.h
+++ b/src/common/identd.h
@@ -17,4 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef HEXCHAT_IDENTD_H
+#define HEXCHAT_IDENTD_H
+
 void identd_start (char *username);
+
+#endif
diff --git a/src/common/inet.h b/src/common/inet.h
index a9fe3e25..36d5bb60 100644
--- a/src/common/inet.h
+++ b/src/common/inet.h
@@ -19,6 +19,9 @@
 
 /* include stuff for internet */
 
+#ifndef HEXCHAT_INET_H
+#define HEXCHAT_INET_H
+
 #ifndef WIN32
 
 #ifdef WANTSOCKET
@@ -60,3 +63,5 @@
 #define sock_error WSAGetLastError
 
 #endif
+
+#endif
diff --git a/src/common/msproxy.h b/src/common/msproxy.h
index 9fb312ad..4371d704 100644
--- a/src/common/msproxy.h
+++ b/src/common/msproxy.h
@@ -21,6 +21,9 @@
  *      Inferno Nettverk A/S, Norway.  All rights reserved.
  */
 
+#ifndef HEXCHAT_MSPROXY_H
+#define HEXCHAT_MSPROXY_H
+
 #include "network.h"
 
 #define MSPROXY_EXECUTABLE 		"hexchat.exe"	/* This probably can be used for access control on the server side */
@@ -255,3 +258,5 @@ struct msproxy_response_t {
 
 int traverse_msproxy (int sok, char *serverAddr, int port, struct msproxy_state_t *state, netstore *ns_proxy, int csok4, int csok6, int *csok, char bound);
 void msproxy_keepalive (void);
+
+#endif
diff --git a/src/common/ssl.h b/src/common/ssl.h
index a59fbf0c..ad34944c 100644
--- a/src/common/ssl.h
+++ b/src/common/ssl.h
@@ -17,9 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/*
-    ...
-*/
+#ifndef HEXCHAT_SSL_H
+#define HEXCHAT_SSL_H
 
 struct cert_info {
     char subject[256];
@@ -82,3 +81,5 @@ int _SSL_recv (SSL * ssl, char *buf, int len);
 #define	_SSL_get_ctx_x509_base64(a)	_SSL_get_ctx_obj_base64(a, 2)
 
 /*int _SSL_verify_x509(X509 *x509);*/
+
+#endif
diff --git a/src/common/strlutil.h b/src/common/strlutil.h
index 0b03a2e0..2d66bc6d 100644
--- a/src/common/strlutil.h
+++ b/src/common/strlutil.h
@@ -14,5 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef HEXCHAT_STRLUTIL_H
+#define HEXCHAT_STRLUTIL_H
+
 size_t strlcat(char *dst, const char *src, size_t siz);
 size_t strlcpy(char *dst, const char *src, size_t siz);
+
+#endif
diff --git a/src/common/thread.h b/src/common/thread.h
index 44c26f7d..2c736ca2 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef HEXCHAT_THREAD_H
+#define HEXCHAT_THREAD_H
+
 #if 0	/* native file dialogs */
 #include <windows.h>
 
@@ -29,3 +32,5 @@ typedef struct
 thread *thread_new (void);
 int thread_start (thread *th, void *(*start_routine)(void *), void *arg);
 #endif
+
+#endif