bzr commit into mysql-trunk-bugfixing branch (davi:3096) WL#5486

[Davi Arnaut]

# At a local mysql-trunk-bugfixing repository of davi

 3096 Davi Arnaut	2010-07-05
      WL#5486: Remove code for unsupported platforms
      
      Remove QNX specific code.

    modified:
      extra/yassl/taocrypt/include/misc.hpp
      include/my_global.h
      include/my_time.h
=== modified file 'extra/yassl/taocrypt/include/misc.hpp'
--- a/extra/yassl/taocrypt/include/misc.hpp	2007-03-23 10:52:25 +0000
+++ b/extra/yassl/taocrypt/include/misc.hpp	2010-07-06 02:41:14 +0000
@@ -125,7 +125,7 @@ void CleanUp();
 
 
 // no gas on these systems ?, disable for now
-#if defined(__sun__) || defined (__QNX__) || defined (__APPLE__)
+#if defined(__sun__) || defined (__APPLE__)
     #define TAOCRYPT_DISABLE_X86ASM
 #endif
 

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2010-07-06 02:37:11 +0000
+++ b/include/my_global.h	2010-07-06 02:41:14 +0000
@@ -46,15 +46,6 @@
 #define HAVE_ERRNO_AS_DEFINE
 #endif /* __CYGWIN__ */
 
-#if defined(__QNXNTO__) && !defined(FD_SETSIZE)
-#define FD_SETSIZE 1024         /* Max number of file descriptor bits in
-                                   fd_set, used when calling 'select'
-                                   Must be defined before including
-                                   "sys/select.h" and "sys/time.h"
-                                 */
-#endif
-
-
 /* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #define USE_PRAGMA_INTERFACE
@@ -566,22 +557,6 @@ C_MODE_END
 extern "C" int madvise(void *addr, size_t len, int behav);
 #endif
 
-#ifdef __QNXNTO__
-/* This has to be after include limits.h */
-#define HAVE_ERRNO_AS_DEFINE
-#define HAVE_FCNTL_LOCK
-#undef  HAVE_FINITE
-#undef  LONGLONG_MIN            /* These get wrongly defined in QNX 6.2 */
-#undef  LONGLONG_MAX            /* standard system library 'limits.h' */
-#ifdef __cplusplus
-#ifndef HAVE_RINT
-#define HAVE_RINT
-#endif                          /* rint() and isnan() functions are not */
-#define rint(a) std::rint(a)    /* visible in C++ scope due to an error */
-#define isnan(a) std::isnan(a)  /* in the usr/include/math.h on QNX     */
-#endif
-#endif
-
 /* We can not live without the following defines */
 
 #define USE_MYFUNC 1		/* Must use syscall indirection */

=== modified file 'include/my_time.h'
--- a/include/my_time.h	2009-12-22 09:35:56 +0000
+++ b/include/my_time.h	2010-07-06 02:41:14 +0000
@@ -35,8 +35,6 @@ extern uchar days_in_month[];
 
   Using the system built in time_t is not an option as
   we rely on the above requirements in the time functions
-
-  For example QNX has an unsigned time_t type
 */
 typedef long my_time_t;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]