bk commit into 5.0 tree (serg:1.1814)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1814 05/03/15 18:31:56 serg@stripped +2 -0
  include/my_global.h
      define _XOPEN_SOURCE=500 for solaris
  include/my_sys.h
      remove a cast

  include/my_sys.h
    1.145 05/03/15 18:31:48 serg@stripped +1 -1
    remove a cast

  include/my_global.h
    1.72 05/03/15 18:31:48 serg@stripped +15 -0
    define _XOPEN_SOURCE=500 for solaris

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.144/include/my_sys.h	Wed Mar  9 13:37:13 2005
+++ 1.145/include/my_sys.h	Tue Mar 15 18:31:48 2005
@@ -812,7 +812,7 @@
 /* qnx ? */
 #define my_getpagesize()        8192
 #endif
-#define my_munmap(a,b)          munmap((char*)(a),(b))
+#define my_munmap(a,b)          munmap((a),(b))
 
 #else
 /* not a complete set of mmap() flags, but only those that nesessary */

--- 1.71/include/my_global.h	Fri Mar  4 11:14:52 2005
+++ 1.72/include/my_global.h	Tue Mar 15 18:31:48 2005
@@ -120,6 +120,21 @@
 #define __STDC_EXT__ 1          /* To get large file support on hpux */
 #endif
 
+/*
+  Solaris include file <sys/feature_tests.h> refers to X/Open document
+
+    System Interfaces and Headers, Issue 5
+
+  saying we should define _XOPEN_SOURCE=500 to get POSIX.1c prototypes
+  but apparently other systems (namely FreeBSD) don't agree.
+  Furthermore X/Open has since 2004 "System Interfaces, Issue 6"
+  that dictates _XOPEN_SOURCE=600, but Solaris checks for 500.
+  So, let's define 500 for solaris only.
+*/
+#ifdef __sun__
+#define _XOPEN_SOURCE 500
+#endif
+
 #if defined(THREAD) && !defined(__WIN__) && !defined(OS2)
 #ifndef _POSIX_PTHREAD_SEMANTICS
 #define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */