From 2839c8a182a9fa1e32fec8a0b969b79c94121aa9 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Fri, 11 Jul 2008 12:28:01 +0000
Subject: INTEGRATION: CWS jsc21 (1.44.16); FILE MERGED 2008/04/23 09:48:35 jsc
 1.44.16.2: RESYNC: (1.44-1.45); FILE MERGED 2008/02/13 08:54:57 jsc
 1.44.16.1: #i72964# remove external header guards

---
 codemaker/source/cppumaker/cpputype.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'codemaker')

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 7b877570d42f..e673c4c575fe 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cpputype.cxx,v $
- * $Revision: 1.45 $
+ * $Revision: 1.46 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -331,7 +331,7 @@ OString CppuType::dumpHeaderDefine(
 
     OStringBuffer tmpBuf(length);
 
-    tmpBuf.append('_');
+    tmpBuf.append("INCLUDED_");
     tmpBuf.append(m_typeName);
     tmpBuf.append('_');
     if (bExtended)
@@ -340,7 +340,6 @@ OString CppuType::dumpHeaderDefine(
         tmpBuf.append('_');
     }
     tmpBuf.append(prefix);
-    tmpBuf.append('_');
 
     OString tmp(tmpBuf.makeStringAndClear().replace('/', '_').toAsciiUpperCase());
 
-- 
cgit