From e4ca173e647ca4a8e14eb1dc065d9a16f29e852b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Fri, 12 Dec 2003 14:57:23 +0000
Subject: [PATCH] Rollback changes which were checked in by accident

svn path=/trunk/; revision=6966
---
 reactos/lib/shlwapi/istream.c | 6 +++---
 reactos/lib/shlwapi/reg.c     | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/reactos/lib/shlwapi/istream.c b/reactos/lib/shlwapi/istream.c
index e81e666bbda..cea294e30b0 100644
--- a/reactos/lib/shlwapi/istream.c
+++ b/reactos/lib/shlwapi/istream.c
@@ -185,7 +185,7 @@ static HRESULT WINAPI IStream_fnSetSize(IStream *iface, ULARGE_INTEGER libNewSiz
   ICOM_THIS(ISHFileStream, iface);
 #endif
 
-  TRACE("(%p,%ld)\n", This, libNewSize.u.LowPart);
+  TRACE("(%p,%ld)\n", This, libNewSize.s.LowPart);
   IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */
   return E_NOTIMPL;
 }
@@ -203,7 +203,7 @@ static HRESULT WINAPI IStream_fnCopyTo(IStream *iface, IStream* pstm, ULARGE_INT
   ULONGLONG ulSize;
   HRESULT hRet = S_OK;
 
-  TRACE("(%p,%p,%ld,%p,%p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten);
+  TRACE("(%p,%p,%ld,%p,%p)\n", This, pstm, cb.s.LowPart, pcbRead, pcbWritten);
 
   if (pcbRead)
     pcbRead->QuadPart = 0;
@@ -278,7 +278,7 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion(IStream *iface, ULARGE_INTEGER
 #ifndef NDEBUG
   ICOM_THIS(ISHFileStream, iface);
 #endif
-  TRACE("(%p,%ld,%ld,%ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType);
+  TRACE("(%p,%ld,%ld,%ld)\n", This, libOffset.s.LowPart, cb.s.LowPart, dwLockType);
   return E_NOTIMPL;
 }
 
diff --git a/reactos/lib/shlwapi/reg.c b/reactos/lib/shlwapi/reg.c
index 0d65ee850db..1d4cfe1632f 100644
--- a/reactos/lib/shlwapi/reg.c
+++ b/reactos/lib/shlwapi/reg.c
@@ -19,11 +19,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef DBG
-#undef DBG
-#define DBG 1
-#endif
-
 #include <stdarg.h>
 #include <string.h>
 #ifdef __REACTOS__