INTEGRATION: CWS changefileheader (1.30.8); FILE MERGED

2008/04/01 12:34:20 thb 1.30.8.2: #i85898# Stripping all external header guards
2008/03/31 13:24:03 rt 1.30.8.1: #i87441# Change license header to LPGL v3.

1 files changed, 19 insertions, 39 deletions

diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c
index d21265c98..b545ff48b 100644
--- a/sal/rtl/source/ustring.c
+++ b/sal/rtl/source/ustring.c
@@ -1,60 +1,43 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $RCSfile: ustring.c,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.30 $
+ * $RCSfile: ustring.c,v $
+ * $Revision: 1.31 $
  *
- *  last change: $Author: vg $ $Date: 2008-03-18 13:18:58 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
 #pragma warning(disable:4738) // storing 32-bit float result in memory, possible loss of performance
 #endif
 
-#ifndef _RTL_MEMORY_H_
 #include <rtl/memory.h>
-#endif
-
-#ifndef _OSL_DIAGNOSE_H_
 #include <osl/diagnose.h>
-#endif
-#ifndef _OSL_INTERLOCK_H_
 #include <osl/interlck.h>
-#endif
-#ifndef _RTL_ALLOC_H_
 #include <rtl/alloc.h>
-#endif
 #include <osl/mutex.h>
 #include <osl/doublecheckedlocking.h>
-
-#ifndef _RTL_TENCINFO_H
 #include <rtl/tencinfo.h>
-#endif
 
 #include <string.h>
 #include <sal/alloca.h>
@@ -62,10 +45,7 @@
 #include "hash.h"
 #include "strimp.h"
 #include "surrogates.h"
-
-#ifndef _RTL_USTRING_H_
 #include <rtl/ustring.h>
-#endif
 
 #include "rtl/math.h"
 #include "rtl/tencinfo.h"