Commit 6ce84f22 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/my51-bug15936 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
sql/unireg.cc:
  Auto merged
parents 8e87d3be 49cf54d1

include/config-win.h

+0 −10
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ functions */ 


#include <sys/locking.h>

#include <windows.h>

#include <math.h>			/* Because of rint() */

#include <fcntl.h>

#include <io.h>

#include <malloc.h>
@@ -222,17 +221,9 @@ typedef uint rf_SetTimer; 
#define inline __inline

#endif /* __cplusplus */



inline double rint(double nr)

{

  double f = floor(nr);

  double c = ceil(nr);

  return (((c-nr) >= (nr-f)) ? f :c);

}



#ifdef _WIN64

#define ulonglong2double(A) ((double) (ulonglong) (A))

#define my_off_t2double(A)  ((double) (my_off_t) (A))



#else

inline double ulonglong2double(ulonglong value)

{
@@ -338,7 +329,6 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_FLOAT_H

#define HAVE_LIMITS_H

#define HAVE_STDDEF_H

#define HAVE_RINT		/* defined in this file */

#define NO_FCNTL_NONBLOCK	/* No FCNTL */

#define HAVE_ALLOCA

#define HAVE_STRPBRK

include/my_base.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define _my_base_h



#ifndef stdin				/* Included first in handler */

#define USES_TYPES			/* my_dir with sys/types is included */

#define CHSIZE_USED

#include <my_global.h>

#include <my_dir.h>			/* This includes types */

mysys/my_append.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#define USES_TYPES				/* sys/types is included */

#include "mysys_priv.h"

#include <sys/stat.h>

#include <m_string.h>

mysys/my_clock.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#define USES_TYPES

#include "my_global.h"



#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__NETWARE__)

mysys/my_copy.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#define USES_TYPES				/* sys/types is included */

#include "mysys_priv.h"

#include <my_dir.h> /* for stat */

#include <m_string.h>