|
1 --- stdcxx-4.2.1/include/ansi/csignal 2008-04-24 20:23:56.000000000 -0400 |
|
2 +++ stdcxx-4.2.1/include/ansi/csignal 2009-03-12 16:35:36.000000000 -0400 |
|
3 @@ -1,80 +1,34 @@ |
|
4 // -*- C++ -*- |
|
5 -/*************************************************************************** |
|
6 +/** |
|
7 + * CDDL HEADER START |
|
8 * |
|
9 - * csignal - C++ Standard library interface to the ANSI C header signal.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: csignal 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/_csignal.h> |
|
54 -#else |
|
55 - |
|
56 -#ifndef _RWSTD_NO_DEPRECATED_C_HEADERS |
|
57 - |
|
58 -#ifndef _RWSTD_NAMESPACE_STD_OPEN |
|
59 -#define _RWSTD_NAMESPACE_STD_OPEN 10 |
|
60 - |
|
61 -_RWSTD_NAMESPACE (std) { |
|
62 - |
|
63 -#endif // _RWSTD_NAMESPACE_STD_OPEN |
|
64 - |
|
65 - |
|
66 -#include _RWSTD_ANSI_C_SIGNAL_H |
|
67 - |
|
68 - |
|
69 -#if _RWSTD_NAMESPACE_STD_OPEN == 10 |
|
70 -# undef _RWSTD_NAMESPACE_STD_OPEN |
|
71 - |
|
72 -} // namespace std |
|
73 - |
|
74 -#endif // _RWSTD_NAMESPACE_STD_OPEN == 10 |
|
75 - |
|
76 -#else // if defined (_RWSTD_NO_DEPRECATED_C_HEADERS) |
|
77 - |
|
78 -#ifndef _RWSTD_CSIGNAL_INCLUDED |
|
79 -#define _RWSTD_CSIGNAL_INCLUDED |
|
80 - |
|
81 -#include _RWSTD_ANSI_C_SIGNAL_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 ::sig_atomic_t; |
|
89 - using ::raise; |
|
90 - using ::signal; |
|
91 - |
|
92 -} // std |
|
93 + * ident "@(#)csignal.13.diff 1.1 09/08/21 SMI" |
|
94 + */ |
|
95 |
|
96 -#endif // !_RWSTD_NO_NAMESPACE && !_RWSTD_NO_HONOR_STD && !_RWSTD_NO_USING_LIBC_IN_STD |
|
97 +#ifndef _SIGNAL_H |
|
98 |
|
99 -#endif // _RWSTD_CSIGNAL_INCLUDED |
|
100 +#include <signal.h> |
|
101 |
|
102 -#endif // _RWSTD_NO_DEPRECATED_C_HEADERS |
|
103 +#endif /* _SIGNAL_H */ |
|
104 |
|
105 -#endif // _RWSTD_NO_PURE_C_HEADERS |