diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 09:18:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 09:18:06 +0000 |
| commit | 1bb736e62f0dd7e9e9aab8d86346bb6583539114 (patch) | |
| tree | 0e478d2186f0196f1a5de217fbbcca5cf6fadae5 /cppu/inc | |
| parent | 83358acd8e6d657aafca5d35a8b184f0e9c4010f (diff) | |
INTEGRATION: CWS changefileheader (1.19.132); FILE MERGED
2008/04/01 15:10:29 thb 1.19.132.3: #i85898# Stripping all external header guards
2008/04/01 12:28:01 thb 1.19.132.2: #i85898# Stripping all external header guards
2008/03/31 07:23:16 rt 1.19.132.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'cppu/inc')
| -rw-r--r-- | cppu/inc/cppu/macros.hxx | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx index 0a674d69f96a..9ce040f2e328 100644 --- a/cppu/inc/cppu/macros.hxx +++ b/cppu/inc/cppu/macros.hxx @@ -1,46 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: macros.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.19 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-08 08:36:25 $ + * $RCSfile: macros.hxx,v $ + * $Revision: 1.20 $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * This file is part of OpenOffice.org. * + * 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. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * 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). * - * 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. * ************************************************************************/ #ifndef _CPPU_MACROS_HXX_ #define _CPPU_MACROS_HXX_ -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif -#ifndef _UNO_LBNAMES_H_ #include <uno/lbnames.h> -#endif /** Namespace name for compiler/ platform, e.g. gcc3, msci */ #define CPPU_CURRENT_NAMESPACE CPPU_ENV |