3 files changed, 53 insertions, 54 deletions
diff --git a/cpp/slice/IceGrid/Admin.ice b/cpp/slice/IceGrid/Admin.ice
index 7ac8075de81..385d58569c6 100644
--- a/cpp/slice/IceGrid/Admin.ice
+++ b/cpp/slice/IceGrid/Admin.ice
@@ -14,7 +14,6 @@
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/SliceChecksumDict.ice>
 #include <IceGrid/Exception.ice>
-#include <IceGrid/Observer.ice>
 #include <IceGrid/Descriptor.ice>
 
 module IceGrid
@@ -22,6 +21,57 @@ module IceGrid
 
 /**
  *
+ * An enumeration representing the state of the server.
+ *
+ **/
+enum ServerState
+{
+    /**
+     *
+     * The server is not running.
+     *
+     **/
+    Inactive,
+
+    /**
+     *
+     * The server is being activated and will change to the active
+     * state when the registered server object adapters are activated.
+     *
+     **/
+    Activating,
+
+    /**
+     *
+     * The server is running.
+     *
+     **/
+    Active,
+    
+    /**
+     *
+     * The server is being deactivated.
+     *
+     **/
+    Deactivating,
+
+    /**
+     *
+     * The server is being destroyed.
+     *
+     **/
+    Destroying,
+
+    /**
+     *
+     * The server is destroyed.
+     *
+     **/
+    Destroyed
+};
+
+/**
+ *
  * A dictionary of proxies.
  *
  **/
diff --git a/cpp/slice/IceGrid/Observer.ice b/cpp/slice/IceGrid/Observer.ice
index 880397f7ca5..40112a6250b 100644
--- a/cpp/slice/IceGrid/Observer.ice
+++ b/cpp/slice/IceGrid/Observer.ice
@@ -13,63 +13,13 @@
 #include <Glacier2/Session.ice>
 #include <IceGrid/Exception.ice>
 #include <IceGrid/Descriptor.ice>
+#include <IceGrid/Admin.ice>
 
 module IceGrid
 {
 
 /**
  *
- * An enumeration representing the state of the server.
- *
- **/
-enum ServerState
-{
-    /**
-     *
-     * The server is not running.
-     *
-     **/
-    Inactive,
-
-    /**
-     *
-     * The server is being activated and will change to the active
-     * state when the registered server object adapters are activated.
-     *
-     **/
-    Activating,
-
-    /**
-     *
-     * The server is running.
-     *
-     **/
-    Active,
-    
-    /**
-     *
-     * The server is being deactivated.
-     *
-     **/
-    Deactivating,
-
-    /**
-     *
-     * The server is being destroyed.
-     *
-     **/
-    Destroying,
-
-    /**
-     *
-     * The server is destroyed.
-     *
-     **/
-    Destroyed
-};
-
-/**
- *
  * Dynamic information about the state of a server.
  *
  **/
diff --git a/cpp/src/IceGrid/icegridnode.dsp b/cpp/src/IceGrid/icegridnode.dsp
index 2b6a3f29b87..4edaf2bb949 100755
--- a/cpp/src/IceGrid/icegridnode.dsp
+++ b/cpp/src/IceGrid/icegridnode.dsp
@@ -74,8 +74,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I ".." /I "../../include" /I "dummyinclude" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c
-# SUBTRACT CPP /Fr /YX
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I ".." /I "../../include" /I "dummyinclude" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /Zm200 /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe