6795209 Enable compilation of ON-consolidation with GCC 4.2

6392640 rpcgen -h -T output does not compile with gcc 4.x

3 files changed, 20 insertions, 20 deletions

diff --git a/usr/src/lib/libnisdb/db_headers.h b/usr/src/lib/libnisdb/db_headers.h
index 9f53e96863..0707b0c8f9 100644
--- a/usr/src/lib/libnisdb/db_headers.h
+++ b/usr/src/lib/libnisdb/db_headers.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -22,12 +21,10 @@
 /*
  *	db_headers.h
  *
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef _DB_HEADERS_H
 #define	_DB_HEADERS_H
 
@@ -36,7 +33,16 @@
 #include <stdlib.h>
 #include <setjmp.h>
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 extern int verbose;
+
+#ifdef  __cplusplus
+}
+#endif
+
 extern jmp_buf dbenv;
 
 #define	FATAL(msg, fcode) \
diff --git a/usr/src/lib/libnisdb/db_index_c.x b/usr/src/lib/libnisdb/db_index_c.x
index 45d019c70a..c8aeae69c9 100644
--- a/usr/src/lib/libnisdb/db_index_c.x
+++ b/usr/src/lib/libnisdb/db_index_c.x
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -22,12 +21,10 @@
 /*
  *	db_index_c.x
  *
- *  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ *  Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  *  Use is subject to license terms.
  */
 
-%#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #if RPC_HDR
 %#ifndef _DB_INDEX_H
 %#define _DB_INDEX_H
@@ -101,7 +98,7 @@ typedef struct db_index * db_index_p;
 %  void init( db_key_desc * );
 %
 %/* Moves an index from an xdr index */
-%  db_status db_index::move_xdr_db_index(db_index *orig);
+%  db_status move_xdr_db_index(db_index *orig);
 %
 %/* Dumps this index to named file. */
 %  int dump( char *);
diff --git a/usr/src/lib/libnisdb/db_mindex_c.x b/usr/src/lib/libnisdb/db_mindex_c.x
index 9d98563dc8..2b7c7d2242 100644
--- a/usr/src/lib/libnisdb/db_mindex_c.x
+++ b/usr/src/lib/libnisdb/db_mindex_c.x
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -22,12 +21,10 @@
 /*
  *	db_mindex_c.x
  *
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-%#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #if RPC_HDR
 %#ifndef _DB_MINDEX_H
 %#define _DB_MINDEX_H
@@ -266,7 +263,7 @@ typedef struct xdr_nis_object_s	xdr_nis_object_t;
 %
 % /* Delete the given list of results; used when no longer interested in 
 %    the results of the first/next query that returned this list.     */
-%  db_status db_mindex::reset_next( db_next_index_desc *orig );
+%  db_status reset_next( db_next_index_desc *orig );
 %
 %/* Return all entries within table.  Returns the answer by
 %   setting the pointer 'rp' to point to the list of answers.