Commit 9248dfc8 authored by knielsen@mysql.com's avatar knielsen@mysql.com

Minor Win32 compile fixes for 4.1.16 release.

parent 114cf112
...@@ -278,10 +278,10 @@ inline double ulonglong2double(ulonglong value) ...@@ -278,10 +278,10 @@ inline double ulonglong2double(ulonglong value)
*((T)+4)=(uchar) (((A) >> 32)); } *((T)+4)=(uchar) (((A) >> 32)); }
#define int8store(T,A) *((ulonglong *) (T))= (ulonglong) (A) #define int8store(T,A) *((ulonglong *) (T))= (ulonglong) (A)
#define doubleget(V,M) { *((long *) &V) = *((long*) M); \ #define doubleget(V,M) do { *((long *) &V) = *((long*) M); \
*(((long *) &V)+1) = *(((long*) M)+1); } *(((long *) &V)+1) = *(((long*) M)+1); } while(0)
#define doublestore(T,V) { *((long *) T) = *((long*) &V); \ #define doublestore(T,V) do { *((long *) T) = *((long*) &V); \
*(((long *) T)+1) = *(((long*) &V)+1); } *(((long *) T)+1) = *(((long*) &V)+1); } while(0)
#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); } #define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }
#define floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float)) #define floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float)) #define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))
......
...@@ -2035,7 +2035,7 @@ Rotate_log_event::Rotate_log_event(THD* thd_arg, ...@@ -2035,7 +2035,7 @@ Rotate_log_event::Rotate_log_event(THD* thd_arg,
llstr(pos_arg, buff), flags)); llstr(pos_arg, buff), flags));
#endif #endif
if (flags & DUP_NAME) if (flags & DUP_NAME)
new_log_ident= my_strdup_with_length(new_log_ident_arg, new_log_ident= my_strdup_with_length((byte*) new_log_ident_arg,
ident_len, ident_len,
MYF(MY_WME)); MYF(MY_WME));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment