1 --- stdcxx-4.2.1/include/ansi/ctime	2008-04-24 20:23:56.000000000 -0400

     2 +++ stdcxx-4.2.1/include/ansi/ctime	2009-03-12 16:35:36.000000000 -0400

     3 @@ -1,91 +1,34 @@

     4  // -*- C++ -*-

     5 -/***************************************************************************

     6 +/**

     7 + * CDDL HEADER START

     8   *

     9 - * ctime - C++ Standard library interface to the ANSI C header time.h

    10 + * The contents of this file are subject to the terms of the

    11 + * Common Development and Distribution License (the "License").

    12 + * You may not use this file except in compliance with the License.

    13   *

    14 - * $Id: ctime 550991 2007-06-26 23:58:07Z sebor $

    15 + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

    16 + * or http://www.opensolaris.org/os/licensing.

    17 + * See the License for the specific language governing permissions

    18 + * and limitations under the License.

    19   *

    20 - ***************************************************************************

    21 + * When distributing Covered Code, include this CDDL HEADER in each

    22 + * file and include the License file at usr/src/OPENSOLARIS.LICENSE.

    23 + * If applicable, add the following below this CDDL HEADER, with the

    24 + * fields enclosed by brackets "[]" replaced with your own identifying

    25 + * information: Portions Copyright [yyyy] [name of copyright owner]

    26   *

    27 - * Licensed to the Apache Software  Foundation (ASF) under one or more

    28 - * contributor  license agreements.  See  the NOTICE  file distributed

    29 - * with  this  work  for  additional information  regarding  copyright

    30 - * ownership.   The ASF  licenses this  file to  you under  the Apache

    31 - * License, Version  2.0 (the  "License"); you may  not use  this file

    32 - * except in  compliance with the License.   You may obtain  a copy of

    33 - * the License at

    34 + * CDDL HEADER END

    35   *

    36 - * http://www.apache.org/licenses/LICENSE-2.0

    37   *

    38 - * Unless required by applicable law or agreed to in writing, software

    39 - * distributed under the  License is distributed on an  "AS IS" BASIS,

    40 - * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or

    41 - * implied.   See  the License  for  the  specific language  governing

    42 - * permissions and limitations under the License.

    43 + * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.

    44 + * Use is subject to license terms.

    45   *

    46 - * Copyright 1994-2006 Rogue Wave Software.

    47 - * 

    48 - **************************************************************************/

    49 -

    50 -#include <rw/_defs.h>

    51 -

    52 -#ifndef _RWSTD_NO_PURE_C_HEADERS

    53 -#  include <ansi/_ctime.h>

    54 -#else

    55 -

    56 -#ifndef _RWSTD_NO_DEPRECATED_C_HEADERS

    57 -

    58 -#ifndef _RWSTD_NAMESPACE_STD_OPEN

    59 -#define _RWSTD_NAMESPACE_STD_OPEN 16

    60 -

    61 -_RWSTD_NAMESPACE (std) { 

    62 -

    63 -#endif   // _RWSTD_NAMESPACE_STD_OPEN

    64 -

    65 -

    66 -#include _RWSTD_ANSI_C_TIME_H

    67 -

    68 -

    69 -#if _RWSTD_NAMESPACE_STD_OPEN == 16

    70 -#  undef _RWSTD_NAMESPACE_STD_OPEN

    71 -

    72 -}   // namespace std

    73 -

    74 -#endif   // _RWSTD_NAMESPACE_STD_OPEN == 16

    75 -

    76 -#else   // if defined (_RWSTD_NO_DEPRECATED_C_HEADERS)

    77 -

    78 -#ifndef _RWSTD_CTIME_INCLUDED

    79 -#define _RWSTD_CTIME_INCLUDED

    80 -

    81 -#include _RWSTD_ANSI_C_TIME_H

    82 -

    83 -#if !defined (_RWSTD_NO_NAMESPACE) && !defined (_RWSTD_NO_HONOR_STD) && \

    84 -    !defined (_RWSTD_NO_USING_LIBC_IN_STD)

    85 -

    86 -namespace std {

    87 -

    88 -    using ::size_t;

    89 -    using ::clock_t;

    90 -    using ::time_t;

    91 -    using ::tm;

    92 -

    93 -    using ::asctime;

    94 -    using ::clock;

    95 -    using ::ctime;

    96 -    using ::difftime;

    97 -    using ::gmtime;

    98 -    using ::localtime;

    99 -    using ::mktime;

   100 -    using ::strftime;

   101 -    using ::time;

   102 -

   103 -}   // std

   104 + * ident "@(#)ctime.19.diff 1.1     09/08/21 SMI"

   105 + */

   106  

   107 -#endif   // !_RWSTD_NO_NAMESPACE && !_RWSTD_NO_HONOR_STD && !_RWSTD_NO_USING_LIBC_IN_STD

   108 +#ifndef _TIME_H

   109  

   110 -#endif   // _RWSTD_CTIME_INCLUDED

   111 +#include <time.h>

   112  

   113 -#endif   // _RWSTD_NO_DEPRECATED_C_HEADERS

   114 +#endif /* _TIME_H */

   115  

   116 -#endif   // _RWSTD_NO_PURE_C_HEADERS