From 0ce15c1a9b8007ccbd4a887ab8c65079d73d760c Mon Sep 17 00:00:00 2001 From: crs Date: Tue, 22 Oct 2002 21:30:48 +0000 Subject: [PATCH] Moved CUnicode to lib/io. That's a reasonable place for it that's after lib/mt. It needs to be after lib/mt in preparation for supporting platforms without the reentrant wide char and multi-byte functions. --- lib/base/Makefile.am | 2 -- lib/{base => io}/CUnicode.cpp | 0 lib/{base => io}/CUnicode.h | 0 lib/io/Makefile.am | 2 ++ lib/platform/Makefile.am | 1 + 5 files changed, 3 insertions(+), 2 deletions(-) rename lib/{base => io}/CUnicode.cpp (100%) rename lib/{base => io}/CUnicode.h (100%) diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am index c02cf460..19ba6847 100644 --- a/lib/base/Makefile.am +++ b/lib/base/Makefile.am @@ -29,14 +29,12 @@ libbase_a_SOURCES = \ CLog.cpp \ CStopwatch.cpp \ CString.cpp \ - CUnicode.cpp \ XBase.cpp \ BasicTypes.h \ CFunctionJob.h \ CLog.h \ CStopwatch.h \ CString.h \ - CUnicode.h \ IInterface.h \ IJob.h \ TMethodJob.h \ diff --git a/lib/base/CUnicode.cpp b/lib/io/CUnicode.cpp similarity index 100% rename from lib/base/CUnicode.cpp rename to lib/io/CUnicode.cpp diff --git a/lib/base/CUnicode.h b/lib/io/CUnicode.h similarity index 100% rename from lib/base/CUnicode.h rename to lib/io/CUnicode.h diff --git a/lib/io/Makefile.am b/lib/io/Makefile.am index 1309e7d5..69665e80 100644 --- a/lib/io/Makefile.am +++ b/lib/io/Makefile.am @@ -30,12 +30,14 @@ libio_a_SOURCES = \ CInputStreamFilter.cpp \ COutputStreamFilter.cpp \ CStreamBuffer.cpp \ + CUnicode.cpp \ XIO.cpp \ CBufferedInputStream.h \ CBufferedOutputStream.h \ CInputStreamFilter.h \ COutputStreamFilter.h \ CStreamBuffer.h \ + CUnicode.h s\ IInputStream.h \ IOutputStream.h \ IStreamFilterFactory.h \ diff --git a/lib/platform/Makefile.am b/lib/platform/Makefile.am index 8da68bf3..53511b5d 100644 --- a/lib/platform/Makefile.am +++ b/lib/platform/Makefile.am @@ -69,5 +69,6 @@ EXTRA_libplatform_a_SOURCES = \ INCLUDES = \ -I$(VDEPTH)/lib/base \ -I$(VDEPTH)/lib/mt \ + -I$(VDEPTH)/lib/io \ -I$(VDEPTH)/lib/synergy \ $(NULL)