diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 10:43:33 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 10:43:33 +0000 |
commit | d0e671efe20e9d22bc367a7bf8322919d551fb6c (patch) | |
tree | 4d9bb28689016f0400676fe8822a46d2c56e833b /connectivity/source/inc | |
parent | 5ca8954f57d8ad022fc5c8a9bfa76d3cd2f282bc (diff) |
INTEGRATION: CWS changefileheader (1.16.74); FILE MERGED
2008/04/01 15:09:17 thb 1.16.74.2: #i85898# Stripping all external header guards
2008/03/28 15:24:34 rt 1.16.74.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'connectivity/source/inc')
-rw-r--r-- | connectivity/source/inc/odbc/OFunctiondefs.hxx | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index f4071891ed..89bf5ba34e 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * 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: OFunctiondefs.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.16 $ + * $RCSfile: OFunctiondefs.hxx,v $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2007-11-02 12:13:28 $ + * 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. * ************************************************************************/ @@ -46,9 +41,7 @@ // just to go with calling convention of windows #define SQL_API __stdcall -#ifndef __SQLEXT_H #include <odbc/sqlext.h> -#endif #undef SQL_API #define SQL_API __stdcall |