3 files changed, 168 insertions, 168 deletions
diff --git a/cpp/demo/Database/Oracle/Makefile.mak b/cpp/demo/Database/Oracle/Makefile.mak
index 3a6b8151672..9f682ebcff6 100644
--- a/cpp/demo/Database/Oracle/Makefile.mak
+++ b/cpp/demo/Database/Oracle/Makefile.mak
@@ -1,19 +1,19 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-SUBDIRS		= proc occi
-
-$(EVERYTHING)::
-	@for %i in ( $(SUBDIRS) ) do \
-	    @echo "making $@ in %i" && \
-	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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.
+#
+# **********************************************************************
+
+top_srcdir	= ..\..\..
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+SUBDIRS		= proc occi
+
+$(EVERYTHING)::
+	@for %i in ( $(SUBDIRS) ) do \
+	    @echo "making $@ in %i" && \
+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/Database/Oracle/occi/Makefile.mak b/cpp/demo/Database/Oracle/occi/Makefile.mak
index efa285cfaae..47bb2a92ea5 100755
--- a/cpp/demo/Database/Oracle/occi/Makefile.mak
+++ b/cpp/demo/Database/Oracle/occi/Makefile.mak
@@ -1,82 +1,82 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-SLICE_SRCS	= HR.ice
-
-OBJS		= HR.obj
-
-COBJS		= Client.obj
-
-SOBJS		= DbTypes.obj \
-                  DbTypesMap.obj \
-                  DeptFactoryI.obj \
-                  DeptI.obj  \
-                  EmpI.obj  \
-                  OCCIServantLocator.obj \
-                  Server.obj \
-                  Util.obj
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-#
-# Disable warnings 4101 and 4291 issued when compiling DbTypes.cpp
-#
-CPPFLAGS	= -I. -I$(ORACLE_HOME)\oci\include -wd4101 -wd4291 $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-#
-# OCCI first
-#
-!if "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS"
-ORACLE_LIBS     = -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc\vc8" oraocci10$(LIBSUFFIX).lib
-!else
-!error "$(CPP_COMPILER) is not supported by this demo"
-!endif
-
-#
-# OCI
-#
-ORACLE_LIBS = $(ORACLE_LIBS) -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc" oci.lib
-
-
-$(CLIENT): $(OBJS) $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(SERVER): $(OBJS) $(SOBJS)
-	rm -f $@
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ
-	ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp mapfile=DbTypesMap.cpp \
-	  intype=DbTypes.typ outtype=DbTypesOut.typ attraccess=private
-
-clean::
-	del /q HR.cpp HR.h
-	del /q DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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.
+#
+# **********************************************************************
+
+top_srcdir	= ..\..\..\..
+
+CLIENT		= client.exe
+SERVER		= server.exe
+
+TARGETS		= $(CLIENT) $(SERVER)
+
+SLICE_SRCS	= HR.ice
+
+OBJS		= HR.obj
+
+COBJS		= Client.obj
+
+SOBJS		= DbTypes.obj \
+                  DbTypesMap.obj \
+                  DeptFactoryI.obj \
+                  DeptI.obj  \
+                  EmpI.obj  \
+                  OCCIServantLocator.obj \
+                  Server.obj \
+                  Util.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+#
+# Disable warnings 4101 and 4291 issued when compiling DbTypes.cpp
+#
+CPPFLAGS	= -I. -I$(ORACLE_HOME)\oci\include -wd4101 -wd4291 $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+#
+# OCCI first
+#
+!if "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS"
+ORACLE_LIBS     = -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc\vc8" oraocci10$(LIBSUFFIX).lib
+!else
+!error "$(CPP_COMPILER) is not supported by this demo"
+!endif
+
+#
+# OCI
+#
+ORACLE_LIBS = $(ORACLE_LIBS) -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc" oci.lib
+
+
+$(CLIENT): $(OBJS) $(COBJS)
+	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+	rm -f $@
+	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ
+	ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp mapfile=DbTypesMap.cpp \
+	  intype=DbTypes.typ outtype=DbTypesOut.typ attraccess=private
+
+clean::
+	del /q HR.cpp HR.h
+	del /q DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ
+
+!include .depend
diff --git a/cpp/demo/Database/Oracle/proc/Makefile.mak b/cpp/demo/Database/Oracle/proc/Makefile.mak
index bc6fbe8b468..6ab7d8fecb5 100755
--- a/cpp/demo/Database/Oracle/proc/Makefile.mak
+++ b/cpp/demo/Database/Oracle/proc/Makefile.mak
@@ -1,67 +1,67 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-PROC_SRCS       = CurrentSqlContext.pc \
-                  Util.pc \
-                  EmpI.pc \
-                  DeptI.pc \
-                  DeptFactoryI.pc \
-                  Server.pc
-
-OBJS		= HR.obj
-
-COBJS		= Client.obj
-
-SOBJS		= $(PROC_SRCS:.pc=.obj)
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I"$(ORACLE_HOME)\precomp\public" -DSQLCA_NONE $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-GENERATED_PROC_FILES  = $(PROC_SRCS:.pc=.cpp) 
-
-ORACLE_LIBS     = -LIBPATH:"$(ORACLE_HOME)\precomp\lib" orasql10.lib
-
-.SUFFIXES:
-.SUFFIXES:		.ice .pc .cpp .c .obj
-
-.pc.cpp:
-	proc threads=yes parse=none lines=yes code=cpp cpp_suffix=cpp close_on_commit=yes $<
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(OBJS) $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(SERVER): $(OBJS) $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-clean::
-	del /q HR.cpp HR.h
-	del /q $(GENERATED_PROC_FILES)
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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.
+#
+# **********************************************************************
+
+top_srcdir	= ..\..\..\..
+
+CLIENT		= client.exe
+SERVER		= server.exe
+
+TARGETS		= $(CLIENT) $(SERVER)
+
+PROC_SRCS       = CurrentSqlContext.pc \
+                  Util.pc \
+                  EmpI.pc \
+                  DeptI.pc \
+                  DeptFactoryI.pc \
+                  Server.pc
+
+OBJS		= HR.obj
+
+COBJS		= Client.obj
+
+SOBJS		= $(PROC_SRCS:.pc=.obj)
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. -I"$(ORACLE_HOME)\precomp\public" -DSQLCA_NONE $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+GENERATED_PROC_FILES  = $(PROC_SRCS:.pc=.cpp) 
+
+ORACLE_LIBS     = -LIBPATH:"$(ORACLE_HOME)\precomp\lib" orasql10.lib
+
+.SUFFIXES:
+.SUFFIXES:		.ice .pc .cpp .c .obj
+
+.pc.cpp:
+	proc threads=yes parse=none lines=yes code=cpp cpp_suffix=cpp close_on_commit=yes $<
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(CLIENT): $(OBJS) $(COBJS)
+	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(SERVER): $(OBJS) $(SOBJS)
+	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+	del /q HR.cpp HR.h
+	del /q $(GENERATED_PROC_FILES)
+
+!include .depend