From 9469b9ee45ea69f201b8622b8a4316d836d638e6 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Thu, 20 Feb 2003 22:26:10 +0000
Subject: [PATCH] Avoid using "__" for defines in headers as it could be
 reserved for the compiler

(Old svn revision: 10934)
---
 src/client.h               | 6 +++---
 src/debug.h                | 6 +++---
 src/events.h               | 6 +++---
 src/frame.h                | 6 +++---
 src/hints.h                | 6 +++---
 src/keyboard.h             | 6 +++---
 src/main.h                 | 6 +++---
 src/menu.h                 | 6 +++---
 src/misc.h                 | 6 +++---
 src/mywindow.h             | 6 +++---
 src/parserc.h              | 6 +++---
 src/pixmap.h               | 6 +++---
 src/session.h              | 6 +++---
 src/settings.h             | 6 +++---
 src/spinning_cursor.h      | 6 +++---
 src/startup_notification.h | 6 +++---
 src/tabwin.h               | 6 +++---
 src/workspaces.h           | 6 +++---
 18 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/client.h b/src/client.h
index 41e08d7c0..41f083c3b 100644
--- a/src/client.h
+++ b/src/client.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __CLIENT_H__
-#define __CLIENT_H__
+#ifndef INC_CLIENT_H__
+#define INC_CLIENT_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -260,4 +260,4 @@ Client *clientGetLeader(Client *);
 char *clientGetStartupId(Client *);
 #endif
 
-#endif /* __CLIENT_H__ */
+#endif /* INC_CLIENT_H__ */
diff --git a/src/debug.h b/src/debug.h
index cd2558ad4..85cccad66 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -15,8 +15,8 @@
 
  */
 
-#ifndef __DEBUG_H__
-#define __DEBUG_H__
+#ifndef INC_DEBUG_H__
+#define INC_DEBUG_H__
 
 #if defined(DEBUG) && DEBUG
 #include <stdio.h>
@@ -25,4 +25,4 @@
 #define DBG(fmt, args...) do {} while(0)
 #endif
 
-#endif /* __DEBUG_H__ */
+#endif /* INC_DEBUG_H__ */
diff --git a/src/events.h b/src/events.h
index 704c15ddc..034883cc7 100644
--- a/src/events.h
+++ b/src/events.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __EVENTS_H__
-#define __EVENTS_H__
+#ifndef INC_EVENTS_H__
+#define INC_EVENTS_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -36,4 +36,4 @@ void handleEvent(XEvent *);
 GtkToXEventFilterStatus xfwm4_event_filter(XEvent * xevent, gpointer data);
 void initGtkCallbacks(void);
 
-#endif /* __EVENTS_H__ */
+#endif /* INC_EVENTS_H__ */
diff --git a/src/frame.h b/src/frame.h
index d48d4c763..6c43bb554 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __FRAME_H__
-#define __FRAME_H__
+#ifndef INC_FRAME_H__
+#define INC_FRAME_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -37,4 +37,4 @@ inline int frameWidth(Client *);
 inline int frameHeight(Client *);
 void frameDraw(Client *, gboolean, gboolean);
 
-#endif /* __FRAME_H__ */
+#endif /* INC_FRAME_H__ */
diff --git a/src/hints.h b/src/hints.h
index cb7ef4c17..922d3ee6e 100644
--- a/src/hints.h
+++ b/src/hints.h
@@ -19,8 +19,8 @@
 
  */
 
-#ifndef __HINTS_H__
-#define __HINTS_H__
+#ifndef INC_HINTS_H__
+#define INC_HINTS_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -209,4 +209,4 @@ gboolean getWindowStartupId(Display *, Window, char **);
 #define setNetHint setGnomeHint
 #define getNetHint getGnomeHint
 
-#endif /* __HINTS_H__ */
+#endif /* INC_HINTS_H__ */
diff --git a/src/keyboard.h b/src/keyboard.h
index 5e47195ef..8e380f587 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __KEYBOARD_H
-#define __KEYBOARD_H
+#ifndef INC_KEYBOARD_H
+#define INC_KEYBOARD_H
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -50,4 +50,4 @@ void grabKey(Display *, MyKey *, Window);
 void ungrabKeys(Display *, Window);
 void initModifiers(Display *);
 
-#endif /* __KEYBOARD_H */
+#endif /* INC_KEYBOARD_H */
diff --git a/src/main.h b/src/main.h
index ba538fab0..900efe14e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __MAIN_H__
-#define __MAIN_H__
+#ifndef INC_MAIN_H__
+#define INC_MAIN_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -72,4 +72,4 @@ extern Cursor resize_cursor[7], move_cursor, busy_cursor, root_cursor;
  *
  */
 
-#endif /* __MAIN_H__ */
+#endif /* INC_MAIN_H__ */
diff --git a/src/menu.h b/src/menu.h
index a36f19a04..eeb19da97 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __MENU_H__
-#define __MENU_H__
+#ifndef INC_MENU_H__
+#define INC_MENU_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -90,4 +90,4 @@ gboolean menu_check_and_close(void);
 gboolean menu_popup(Menu * menu, int root_x, int root_y, int button, guint32 timestamp);
 void menu_free(Menu * menu);
 
-#endif /* __MENU_H__ */
+#endif /* INC_MENU_H__ */
diff --git a/src/misc.h b/src/misc.h
index bbaab1da9..b0fef92c1 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __MISC_H__
-#define __MISC_H__
+#ifndef INC_MISC_H__
+#define INC_MISC_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -35,4 +35,4 @@ void sendClientMessage(Window, Atom, long, int);
 Window setTmpEventWin(long);
 void removeTmpEventWin(Window);
 
-#endif /* __MISC_H__ */
+#endif /* INC_MISC_H__ */
diff --git a/src/mywindow.h b/src/mywindow.h
index 8b73ab3b7..4a677995f 100644
--- a/src/mywindow.h
+++ b/src/mywindow.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __MYWINDOW_H__
-#define __MYWINDOW_H__
+#ifndef INC_MYWINDOW_H__
+#define INC_MYWINDOW_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -45,4 +45,4 @@ void myWindowDelete(myWindow *);
 void myWindowShow(myWindow *, int, int, int, int, gboolean);
 void myWindowHide(myWindow *);
 
-#endif /* __MYWINDOW_H__ */
+#endif /* INC_MYWINDOW_H__ */
diff --git a/src/parserc.h b/src/parserc.h
index e189f06c1..fd02198cc 100644
--- a/src/parserc.h
+++ b/src/parserc.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __PARSERC_H__
-#define __PARSERC_H__
+#ifndef INC_PARSERC_H__
+#define INC_PARSERC_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -37,4 +37,4 @@ gboolean setIntValueFromInt(const gchar *, int, Settings rc[]);
 gchar *getThemeDir(const gchar *);
 void freeRc(Settings rc[]);
 
-#endif /* __PARSERC_H__ */
+#endif /* INC_PARSERC_H__ */
diff --git a/src/pixmap.h b/src/pixmap.h
index 6ecc6f7fd..0476186c8 100644
--- a/src/pixmap.h
+++ b/src/pixmap.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __PIXMAP_H__
-#define __PIXMAP_H__
+#ifndef INC_PIXMAP_H__
+#define INC_PIXMAP_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -40,4 +40,4 @@ void createPixmap(Display *, MyPixmap *, gint, gint);
 void initPixmap(MyPixmap *);
 void freePixmap(Display *, MyPixmap *);
 
-#endif /* __PIXMAP_H__ */
+#endif /* INC_PIXMAP_H__ */
diff --git a/src/session.h b/src/session.h
index 77b834771..cd6a2b931 100644
--- a/src/session.h
+++ b/src/session.h
@@ -16,8 +16,8 @@
 
  */
 
-#ifndef __SESSION_H__
-#define __SESSION_H__
+#ifndef INC_SESSION_H__
+#define INC_SESSION_H__
 
 #include <glib.h>
 #include "client.h"
@@ -43,4 +43,4 @@ void sessionFreeWindowStates(void);
 */
 gboolean sessionMatchWinToSM(Client *);
 
-#endif /* __CLIENT_H__ */
+#endif /* INC_CLIENT_H__ */
diff --git a/src/settings.h b/src/settings.h
index 28df9a62f..84a54b593 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __SETTINGS_H__
-#define __SETTINGS_H__
+#ifndef INC_SETTINGS_H__
+#define INC_SETTINGS_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -177,4 +177,4 @@ void unloadSettings(void);
 gboolean reloadSettings(int);
 gboolean initSettings(void);
 
-#endif /* __SETTINGS_H__ */
+#endif /* INC_SETTINGS_H__ */
diff --git a/src/spinning_cursor.h b/src/spinning_cursor.h
index 465dc9ee9..07f93f83e 100644
--- a/src/spinning_cursor.h
+++ b/src/spinning_cursor.h
@@ -22,11 +22,11 @@
 #  include "config.h"
 #endif
 
-#ifndef __SPINNING_CURSOR_H__
-#define __SPINNING_CURSOR_H__
+#ifndef INC_SPINNING_CURSOR_H__
+#define INC_SPINNING_CURSOR_H__
 
 #include <X11/Xlib.h>
 
 Cursor cursorCreateSpinning(Display * dpy, Window window);
 
-#endif /* __SPINNING_CURSOR_H__ */
+#endif /* INC_SPINNING_CURSOR_H__ */
diff --git a/src/startup_notification.h b/src/startup_notification.h
index 9b7a03e26..ac4cc8386 100644
--- a/src/startup_notification.h
+++ b/src/startup_notification.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __STARTUP_NOTIFICATION_H__
-#define __STARTUP_NOTIFICATION_H__
+#ifndef INC_STARTUP_NOTIFICATION_H__
+#define INC_STARTUP_NOTIFICATION_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -45,4 +45,4 @@ void sn_process_event(XEvent * event);
 #define sn_process_event(e) ;
 
 #endif /* HAVE_STARTUP_NOTIFICATION */
-#endif /* __STARTUP_NOTIFICATION_H__ */
+#endif /* INC_STARTUP_NOTIFICATION_H__ */
diff --git a/src/tabwin.h b/src/tabwin.h
index d875dc1c3..cc72160e1 100644
--- a/src/tabwin.h
+++ b/src/tabwin.h
@@ -21,8 +21,8 @@
 #  include "config.h"
 #endif
 
-#ifndef __TABWIN_H__
-#define __TABWIN_H__
+#ifndef INC_TABWIN_H__
+#define INC_TABWIN_H__
 
 #include <glib.h>
 #include <gdk/gdk.h>
@@ -41,4 +41,4 @@ Tabwin *tabwinCreate(gchar * label);
 void tabwinSetLabel(Tabwin * tabwin, gchar * label);
 void tabwinDestroy(Tabwin * tabwin);
 
-#endif /* __TABWIN_H__ */
+#endif /* INC_TABWIN_H__ */
diff --git a/src/workspaces.h b/src/workspaces.h
index 0b00b8ca6..bfb987a19 100644
--- a/src/workspaces.h
+++ b/src/workspaces.h
@@ -18,8 +18,8 @@
 
  */
 
-#ifndef __WORKSPACES_H__
-#define __WORKSPACES_H__
+#ifndef INC_WORKSPACES_H__
+#define INC_WORKSPACES_H__
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -34,4 +34,4 @@ void workspaceSwitch(int, Client *);
 void workspaceSetCount(int);
 void workspaceUpdateArea(CARD32 *, CARD32 *);
 
-#endif /* __WORKSPACES_H__ */
+#endif /* INC_WORKSPACES_H__ */
-- 
GitLab