From 2544ff381a0501119a8e1e9e1316c09ae561f7f8 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+hg@gmail.com>
Date: Wed, 24 Nov 2010 16:38:12 -0500
Subject: [PATCH] avoid circular dependency by moving modes/modes.h to modes.h

---
 .hgignore  | 2 +-
 SConstruct | 2 +-
 dwss.cc    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.hgignore b/.hgignore
index 72f4ca4..6b8ca52 100644
--- a/.hgignore
+++ b/.hgignore
@@ -2,4 +2,4 @@ glob:.scons*
 glob:*.o
 glob:dwss
 glob:LoadFile-gen.inc
-^modes/modes.h$
+^modes.h$
diff --git a/SConstruct b/SConstruct
index 5441afe..6577520 100644
--- a/SConstruct
+++ b/SConstruct
@@ -23,7 +23,7 @@ sources = [Glob('*.c'), Glob('*.cc'), Glob('LoadFile/*.cc')]
 env.LoadFile('LoadFile-gen.inc', load_files)
 env.Depends('LoadFile-gen.inc', 'genLoadFile.pl')
 
-env.Modes('modes/modes.h', Glob('modes/*.h'))
+env.Modes('modes.h', Glob('modes/*.h'))
 
 dwss = env.Program('dwss', sources)
 
diff --git a/dwss.cc b/dwss.cc
index 2947bd2..f298ba3 100644
--- a/dwss.cc
+++ b/dwss.cc
@@ -9,7 +9,7 @@
 #include <GL/glu.h>
 
 #include "GnomeScreensaver.h"
-#include "modes/modes.h"
+#include "modes.h"
 
 using namespace std;