6 files changed, 60 insertions, 27 deletions
diff --git a/cpp/INSTALL.WINDOWS b/cpp/INSTALL.WINDOWS
index eff1c1f38b5..b4145cc1001 100644
--- a/cpp/INSTALL.WINDOWS
+++ b/cpp/INSTALL.WINDOWS
@@ -68,7 +68,7 @@ The following C++ compilers are supported:
 
 
 C++Builder 2010 Setup
----------------------------------
+---------------------
 
 Users of C++Builder 2010 need to install the Microsoft Platform SDK:
 
@@ -81,17 +81,6 @@ executing the following script from within the compiler command prompt:
   C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\SetEnv.Cmd
 
 
-Visual C++ 2008 Express Setup
----------------------------------
-
-Users of Visual C++ 2008 Express need to install the Microsoft Platform SDK:
-
-  http://www.microsoft.com/downloads/details.aspx?FamilyID=c17ba869-9671-4330-a63e-1fd44e0e2505&displaylang=en
-
-Once installed, you need to make it the current sdk by running the configuration
-tool (Microsoft Windows SDK v7.0->Visual Studio Registration->Windows SDK
-Configuration Tool) and then choosing v7.0 and selecting "Make Current".
-
 Visual C++ 6.0 Setup
 --------------------
 
diff --git a/cpp/src/Ice/.gitignore b/cpp/src/Ice/.gitignore
index 32db842be15..3272da75f36 100644
--- a/cpp/src/Ice/.gitignore
+++ b/cpp/src/Ice/.gitignore
@@ -71,4 +71,3 @@ ServantLocator.h
 SliceChecksumDict.h
 StatsF.h
 Stats.h
-EventLoggerMsg.h
diff --git a/cpp/src/Ice/EventLoggerMsg.h b/cpp/src/Ice/EventLoggerMsg.h
new file mode 100755
index 00000000000..0ebe5b8efb8
--- /dev/null
+++ b/cpp/src/Ice/EventLoggerMsg.h
@@ -0,0 +1,53 @@
+ // **********************************************************************
+ //
+ // Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+ //
+ // This copy of Ice is licensed to you under the terms described in the
+ // ICE_LICENSE file included in this distribution.
+ //
+ // **********************************************************************
+//
+//  Values are 32 bit values laid out as follows:
+//
+//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//  +---+-+-+-----------------------+-------------------------------+
+//  |Sev|C|R|     Facility          |               Code            |
+//  +---+-+-+-----------------------+-------------------------------+
+//
+//  where
+//
+//      Sev - is the severity code
+//
+//          00 - Success
+//          01 - Informational
+//          10 - Warning
+//          11 - Error
+//
+//      C - is the Customer code flag
+//
+//      R - is a reserved bit
+//
+//      Facility - is the facility code
+//
+//      Code - is the facility's status code
+//
+//
+// Define the facility codes
+//
+
+
+//
+// Define the severity codes
+//
+
+
+//
+// MessageId: EVENT_LOGGER_MSG
+//
+// MessageText:
+//
+// %1
+//
+#define EVENT_LOGGER_MSG                 0x00000000L
+
diff --git a/cpp/src/Ice/EventLoggerMsg.rc b/cpp/src/Ice/EventLoggerMsg.rc
new file mode 100755
index 00000000000..a928b138ef4
--- /dev/null
+++ b/cpp/src/Ice/EventLoggerMsg.rc
@@ -0,0 +1,2 @@
+LANGUAGE 0x9,0x1
+1 11 "MSG00001.bin"
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 03978520aa1..b1c2e255351 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -173,19 +173,9 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
 install:: all
 	$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
 
-clean::
-	-rm -f EventLoggerMsg.h
-
 $(HDIR)/BuiltinSequences.h BuiltinSequences.cpp: $(SDIR)/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB)
 	rm -f $(HDIR)/BuiltinSequences.h BuiltinSequences.cpp
 	$(SLICE2CPP) $(SLICE2CPPFLAGS) --stream $(SDIR)/BuiltinSequences.ice
 	mv BuiltinSequences.h $(HDIR)
 
-# The dummy EventLoggerMsg.h is necessary to get correct dependencies
-# for windows
-Service.cpp: EventLoggerMsg.h
-
-EventLoggerMsg.h:
-	-touch EventLoggerMsg.h
-
 include .depend
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index 7715f85baae..5f496d3980f 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -151,11 +151,12 @@ $(HDIR)\BuiltinSequences.h BuiltinSequences.cpp: $(SDIR)\BuiltinSequences.ice $(
 
 Service.obj: EventLoggerMsg.h
 
-EventLoggerMsg.h EventLoggerMsg.rc: EventLoggerMsg.mc
-	mc EventLoggerMsg.mc
-
 Ice.res: EventLoggerMsg.rc
 
+# These files are not automatically generated because VC2008 Express doesn't have mc.exe
+#EventLoggerMsg.h EventLoggerMsg.rc: EventLoggerMsg.mc
+#	mc EventLoggerMsg.mc
+
 !if "$(CPP_COMPILER)" == "BCC2010" & "$(OPTIMIZE)" == "yes"
 #
 # Tests fail if GC.cpp is built with optimizations enabled
@@ -200,7 +201,6 @@ clean::
 	-del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
 	-del /q StatsF.cpp $(HDIR)\StatsF.h
 	-del /q Stats.cpp $(HDIR)\Stats.h
-	-del /q EventLoggerMsg.h EventLoggerMsg.rc
 	-del /q Ice.res
 
 install:: all