diff options
Diffstat (limited to 'dbm/include/cdefs.h')
| -rw-r--r-- | dbm/include/cdefs.h | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/dbm/include/cdefs.h b/dbm/include/cdefs.h index a933c5882..63c2f624a 100644 --- a/dbm/include/cdefs.h +++ b/dbm/include/cdefs.h @@ -1,24 +1,40 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: NPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ + * The contents of this file are subject to the Netscape Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/NPL/ * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. * - * Contributor(s): - */ + * Contributor(s): + * + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the NPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ /* * Copyright (c) 1991, 1993 @@ -61,13 +77,6 @@ #ifndef _CDEFS_H_ #define _CDEFS_H_ -#ifdef __BEGIN_DECLS -#undef __BEGIN_DECLS -#endif -#ifdef __END_DECLS -#undef __END_DECLS -#endif - #if defined(__cplusplus) #define __BEGIN_DECLS extern "C" { #define __END_DECLS } @@ -83,15 +92,12 @@ * in between its arguments. __CONCAT can also concatenate double-quoted * strings produced by the __STRING macro, but this only works with ANSI C. */ -#undef __P -#undef __CONCAT -#undef __STRING - #if defined(__STDC__) || defined(__cplusplus) || defined(_WINDOWS) || defined(XP_OS2) #define __P(protos) protos /* full-blown ANSI C */ #define __CONCAT(x,y) x ## y #define __STRING(x) #x +/* On HP-UX 11.00, <sys/stdsyms.h> defines __const. */ #ifndef __const #define __const const /* define reserved names to standard */ #endif /* __const */ @@ -156,11 +162,4 @@ #define __pure #endif -#ifdef AIXV3 -/* Wont compile without const. Need a cleaner way to handle this. */ -#ifdef const -#undef const -#endif -#endif - #endif /* !_CDEFS_H_ */ |