Mercurial > illumos > illumos-gate

changeset 3383:f7dba0db8250

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6506270 __EXTENSIONS__ does not make visible symbol altzone in /usr/include/time.h
author damico
date Mon, 08 Jan 2007 16:21:19 -0800
parents 54f69efb34be
children 98c7bf996818
files usr/src/head/time.h usr/src/uts/common/sys/mman.h
diffstat 2 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/head/time.h	Mon Jan 08 15:46:11 2007 -0800
+++ b/usr/src/head/time.h	Mon Jan 08 16:21:19 2007 -0800
@@ -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.
@@ -24,7 +23,7 @@
 
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -176,7 +175,8 @@
 
 #endif /* !defined(_STRICT_STDC) || defined(__XOPEN_OR_POSIX)... */
 
-#if (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
+#if (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \
+	defined(__EXTENSIONS__)
 extern int cftime(char *, char *, const time_t *);
 extern int ascftime(char *, const char *, const struct tm *);
 extern long altzone;
--- a/usr/src/uts/common/sys/mman.h	Mon Jan 08 15:46:11 2007 -0800
+++ b/usr/src/uts/common/sys/mman.h	Mon Jan 08 16:21:19 2007 -0800
@@ -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.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -153,8 +152,6 @@
 #if (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2)) || defined(__EXTENSIONS__)
 extern int mlock(const void *, size_t);
 extern int munlock(const void *, size_t);
-extern int shm_open(const char *, int, mode_t);
-extern int shm_unlink(const char *);
 #endif	/* (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2))... */
 /* transitional large file interface version */
 #if	defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
@@ -188,6 +185,8 @@
 #if (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2)) || defined(__EXTENSIONS__)
 extern int mlockall(int);
 extern int munlockall(void);
+extern int shm_open(const char *, int, mode_t);
+extern int shm_unlink(const char *);
 #endif
 
 /* mmap failure value */
@@ -207,6 +206,9 @@
 extern int munlock();
 extern int munlockall();
 extern int meminfo();
+extern int shm_open();
+extern int shm_unlink();
+
 /* transitional large file interface version */
 #if	defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
 	    !defined(__PRAGMA_REDEFINE_EXTNAME))