PERFORCE change 130826 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=130826

Change 130826 by jb at jb_freebsd1 on 2007/12/14 00:54:17

	Remove _SOLARIS_C_SOURCE now that we aren't doing the
	compatibility that way.

Affected files ...

.. //depot/projects/dtrace7/src/cddl/Makefile.inc#2 edit
.. //depot/projects/dtrace7/src/include/elf.h#2 edit
.. //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#2 edit
.. //depot/projects/dtrace7/src/sys/sys/elf.h#2 edit
.. //depot/projects/dtrace7/src/sys/sys/kernel.h#3 edit
.. //depot/projects/dtrace7/src/sys/sys/param.h#3 edit
.. //depot/projects/dtrace7/src/sys/sys/stat.h#2 edit
.. //depot/projects/dtrace7/src/sys/sys/time.h#2 edit
.. //depot/projects/dtrace7/src/sys/sys/types.h#2 edit

Differences ...

==== //depot/projects/dtrace7/src/cddl/Makefile.inc#2 (text+ko) ====

@@ -1,3 +1,2 @@
 # $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
 
-CFLAGS+= -D_SOLARIS_C_SOURCE

==== //depot/projects/dtrace7/src/include/elf.h#2 (text+ko) ====

@@ -38,8 +38,4 @@
 #include <sys/elf32.h>
 #include <sys/elf64.h>
 
-#ifdef _SOLARIS_C_SOURCE
-#include <sys/_elf_solaris.h>
-#endif
-
 #endif /* !_ELF_H_ */

==== //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#2 (text+ko) ====

@@ -76,8 +76,6 @@
 CWARNFLAGS+=-Wno-unused
 CWARNFLAGS+=-Wno-switch
 
-CFLAGS+=-D_SOLARIS_C_SOURCE
-
 CFLAGS+=-I${.CURDIR}/../../compat/opensolaris
 CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/zmod

==== //depot/projects/dtrace7/src/sys/sys/elf.h#2 (text+ko) ====

@@ -38,8 +38,4 @@
 #include <sys/elf32.h>
 #include <sys/elf64.h>
 
-#ifdef _SOLARIS_C_SOURCE
-#include <sys/_elf_solaris.h>
-#endif
-
 #endif /* !_SYS_ELF_H_ */

==== //depot/projects/dtrace7/src/sys/sys/kernel.h#3 (text+ko) ====

@@ -68,9 +68,7 @@
 extern int profhz;			/* profiling clock's frequency */
 extern int profprocs;			/* number of process's profiling */
 extern int ticks;
-#ifndef _SOLARIS_C_SOURCE
 extern int lbolt;			/* once a second sleep address */
-#endif
 
 #endif /* _KERNEL */
 

==== //depot/projects/dtrace7/src/sys/sys/param.h#3 (text+ko) ====

@@ -305,20 +305,4 @@
 #define ctodb(db)			/* calculates pages to devblks */ \
 	((db) << (PAGE_SHIFT - DEV_BSHIFT))
 
-/*
- * Solaris compatibility definitions.
- */
-#ifdef _SOLARIS_C_SOURCE
-#define	PAGESIZE	PAGE_SIZE
-
-/*
- * The OpenSolaris version is set according to the version last imported
- * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header
- * files it can be used to determine the level of compatibility that the
- * FreeBSD headers provide to OpenSolaris code. Perhaps one day there
- * will be a really, really Single Unix Specification.
- */
-#define __OpenSolaris_version 20060731
-#endif
-
 #endif	/* _SYS_PARAM_H_ */

==== //depot/projects/dtrace7/src/sys/sys/stat.h#2 (text+ko) ====

@@ -304,14 +304,6 @@
 
 #endif /* __BSD_VISIBLE */
 
-/*
- * Solaris compatibility definitions.
- */
-#ifdef _SOLARIS_C_SOURCE
-#define	stat64	stat
-#define	fstat64	fstat
-#endif
-
 #ifndef _KERNEL
 __BEGIN_DECLS
 #if __BSD_VISIBLE

==== //depot/projects/dtrace7/src/sys/sys/time.h#2 (text+ko) ====

@@ -324,27 +324,4 @@
 
 #endif /* !_KERNEL */
 
-/*
- * Solaris compatibility definitions.
- */
-#ifdef _SOLARIS_C_SOURCE
-/*
- *  Definitions for commonly used resolutions.
- */
-#define SEC		1
-#define MILLISEC	1000
-#define MICROSEC	1000000
-#define NANOSEC		1000000000
-
-typedef longlong_t	hrtime_t;
-
-#ifndef _KERNEL
-static __inline hrtime_t gethrtime(void) {
-	struct timespec ts;
-	clock_gettime(CLOCK_UPTIME,&ts);
-	return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
-}
-#endif
-#endif /* _SOLARIS_C_SOURCE */
-
 #endif /* !_SYS_TIME_H_ */

==== //depot/projects/dtrace7/src/sys/sys/types.h#2 (text+ko) ====

@@ -297,36 +297,6 @@
 #endif /* !_KERNEL */
 
 /*
- * Solaris compatibility definitions.
- */
-#ifdef _SOLARIS_C_SOURCE
-typedef u_int		uint_t;
-typedef u_char		uchar_t;
-typedef u_short		ushort_t;
-typedef u_long		ulong_t;
-
-typedef	long long	longlong_t;  
-typedef unsigned long long	u_longlong_t;
-
-typedef off_t		off64_t;
-
-typedef id_t		taskid_t;
-typedef id_t		projid_t;
-typedef id_t		poolid_t;
-typedef id_t		zoneid_t;
-typedef id_t		ctid_t;
-
-#ifndef _KERNEL
-#if defined(__XOPEN_OR_POSIX)
-typedef enum { _B_FALSE, _B_TRUE } boolean_t;
-#else
-typedef enum { B_FALSE, B_TRUE } boolean_t;
-#endif /* defined(__XOPEN_OR_POSIX) */
-#endif
-
-#endif /* _SOLARIS_C_SOURCE */
-
-/*
  * The following are all things that really shouldn't exist in this header,
  * since its purpose is to provide typedefs, not miscellaneous doodads.
  */