diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 10:02:28 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 10:02:28 +0000 |
commit | b654a3bd07a99a07077ad585bc353c63c46042cf (patch) | |
tree | 0de0759f89343803c8bca9faa355aa20273c6bd6 /sal/osl/os2/thread.c | |
parent | f625fa045e450698507b1dd0dbc6fb2c982acfdf (diff) |
INTEGRATION: CWS changefileheader (1.6.70); FILE MERGED
2008/04/01 12:34:08 thb 1.6.70.2: #i85898# Stripping all external header guards
2008/03/31 13:23:42 rt 1.6.70.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sal/osl/os2/thread.c')
-rw-r--r-- | sal/osl/os2/thread.c | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/sal/osl/os2/thread.c b/sal/osl/os2/thread.c index b87ee8391f2b..d84c09326d9b 100644 --- a/sal/osl/os2/thread.c +++ b/sal/osl/os2/thread.c @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: thread.c,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.6 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-11-02 12:33:43 $ + * $RCSfile: thread.c,v $ + * $Revision: 1.7 $ * - * 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. * ************************************************************************/ @@ -38,9 +33,7 @@ #include <osl/diagnose.h> #include <osl/thread.h> -#ifndef _OSL_TIME_H_ #include <osl/time.h> -#endif #include <rtl/alloc.h> #include <rtl/tencinfo.h> |