merge.

checkpoint.
does not compile.

1 files changed, 110 insertions, 110 deletions

diff --git a/include/myisampack.h b/include/myisampack.h
index ecf35520a88..41b53f26a5f 100644
--- a/include/myisampack.h
+++ b/include/myisampack.h
@@ -27,58 +27,58 @@
 #define mi_sint1korr(A) ((int8)(*A))
 #define mi_uint1korr(A) ((uint8)(*A))
 
-#define mi_sint2korr(A) ((int16) (((int16) (((uchar*) (A))[1])) +\
-                                  ((int16) ((int16) ((char*) (A))[0]) << 8)))
-#define mi_sint3korr(A) ((int32) (((((uchar*) (A))[0]) & 128) ? \
+#define mi_sint2korr(A) ((int16) (((int16) (((const uchar*) (A))[1])) +\
+                                  ((int16) ((int16) ((const char*) (A))[0]) << 8)))
+#define mi_sint3korr(A) ((int32) (((((const uchar*) (A))[0]) & 128) ? \
                                   (((uint32) 255L << 24) | \
-                                   (((uint32) ((uchar*) (A))[0]) << 16) |\
-                                   (((uint32) ((uchar*) (A))[1]) << 8) | \
-                                   ((uint32) ((uchar*) (A))[2])) : \
-                                  (((uint32) ((uchar*) (A))[0]) << 16) |\
-                                  (((uint32) ((uchar*) (A))[1]) << 8) | \
-                                  ((uint32) ((uchar*) (A))[2])))
-#define mi_sint4korr(A) ((int32) (((int32) (((uchar*) (A))[3])) +\
-                                  ((int32) (((uchar*) (A))[2]) << 8) +\
-                                  ((int32) (((uchar*) (A))[1]) << 16) +\
-                                  ((int32) ((int16) ((char*) (A))[0]) << 24)))
+                                   (((uint32) ((const uchar*) (A))[0]) << 16) |\
+                                   (((uint32) ((const uchar*) (A))[1]) << 8) | \
+                                   ((uint32) ((const uchar*) (A))[2])) : \
+                                  (((uint32) ((const uchar*) (A))[0]) << 16) |\
+                                  (((uint32) ((const uchar*) (A))[1]) << 8) | \
+                                  ((uint32) ((const uchar*) (A))[2])))
+#define mi_sint4korr(A) ((int32) (((int32) (((const uchar*) (A))[3])) +\
+                                  ((int32) (((const uchar*) (A))[2]) << 8) +\
+                                  ((int32) (((const uchar*) (A))[1]) << 16) +\
+                                  ((int32) ((int16) ((const char*) (A))[0]) << 24)))
 #define mi_sint8korr(A) ((longlong) mi_uint8korr(A))
-#define mi_uint2korr(A) ((uint16) (((uint16) (((uchar*) (A))[1])) +\
-                                   ((uint16) (((uchar*) (A))[0]) << 8)))
-#define mi_uint3korr(A) ((uint32) (((uint32) (((uchar*) (A))[2])) +\
-                                   (((uint32) (((uchar*) (A))[1])) << 8) +\
-                                   (((uint32) (((uchar*) (A))[0])) << 16)))
-#define mi_uint4korr(A) ((uint32) (((uint32) (((uchar*) (A))[3])) +\
-                                   (((uint32) (((uchar*) (A))[2])) << 8) +\
-                                   (((uint32) (((uchar*) (A))[1])) << 16) +\
-                                   (((uint32) (((uchar*) (A))[0])) << 24)))
-#define mi_uint5korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[4])) +\
-                                    (((uint32) (((uchar*) (A))[3])) << 8) +\
-                                    (((uint32) (((uchar*) (A))[2])) << 16) +\
-                                    (((uint32) (((uchar*) (A))[1])) << 24)) +\
-                                    (((ulonglong) (((uchar*) (A))[0])) << 32))
-#define mi_uint6korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[5])) +\
-                                    (((uint32) (((uchar*) (A))[4])) << 8) +\
-                                    (((uint32) (((uchar*) (A))[3])) << 16) +\
-                                    (((uint32) (((uchar*) (A))[2])) << 24)) +\
-                        (((ulonglong) (((uint32) (((uchar*) (A))[1])) +\
-                                    (((uint32) (((uchar*) (A))[0]) << 8)))) <<\
+#define mi_uint2korr(A) ((uint16) (((uint16) (((const uchar*) (A))[1])) +\
+                                   ((uint16) (((const uchar*) (A))[0]) << 8)))
+#define mi_uint3korr(A) ((uint32) (((uint32) (((const uchar*) (A))[2])) +\
+                                   (((uint32) (((const uchar*) (A))[1])) << 8) +\
+                                   (((uint32) (((const uchar*) (A))[0])) << 16)))
+#define mi_uint4korr(A) ((uint32) (((uint32) (((const uchar*) (A))[3])) +\
+                                   (((uint32) (((const uchar*) (A))[2])) << 8) +\
+                                   (((uint32) (((const uchar*) (A))[1])) << 16) +\
+                                   (((uint32) (((const uchar*) (A))[0])) << 24)))
+#define mi_uint5korr(A) ((ulonglong)(((uint32) (((const uchar*) (A))[4])) +\
+                                    (((uint32) (((const uchar*) (A))[3])) << 8) +\
+                                    (((uint32) (((const uchar*) (A))[2])) << 16) +\
+                                    (((uint32) (((const uchar*) (A))[1])) << 24)) +\
+                                    (((ulonglong) (((const uchar*) (A))[0])) << 32))
+#define mi_uint6korr(A) ((ulonglong)(((uint32) (((const uchar*) (A))[5])) +\
+                                    (((uint32) (((const uchar*) (A))[4])) << 8) +\
+                                    (((uint32) (((const uchar*) (A))[3])) << 16) +\
+                                    (((uint32) (((const uchar*) (A))[2])) << 24)) +\
+                        (((ulonglong) (((uint32) (((const uchar*) (A))[1])) +\
+                                    (((uint32) (((const uchar*) (A))[0]) << 8)))) <<\
                                      32))
-#define mi_uint7korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[6])) +\
-                                    (((uint32) (((uchar*) (A))[5])) << 8) +\
-                                    (((uint32) (((uchar*) (A))[4])) << 16) +\
-                                    (((uint32) (((uchar*) (A))[3])) << 24)) +\
-                        (((ulonglong) (((uint32) (((uchar*) (A))[2])) +\
-                                    (((uint32) (((uchar*) (A))[1])) << 8) +\
-                                    (((uint32) (((uchar*) (A))[0])) << 16))) <<\
+#define mi_uint7korr(A) ((ulonglong)(((uint32) (((const uchar*) (A))[6])) +\
+                                    (((uint32) (((const uchar*) (A))[5])) << 8) +\
+                                    (((uint32) (((const uchar*) (A))[4])) << 16) +\
+                                    (((uint32) (((const uchar*) (A))[3])) << 24)) +\
+                        (((ulonglong) (((uint32) (((const uchar*) (A))[2])) +\
+                                    (((uint32) (((const uchar*) (A))[1])) << 8) +\
+                                    (((uint32) (((const uchar*) (A))[0])) << 16))) <<\
                                      32))
-#define mi_uint8korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[7])) +\
-                                    (((uint32) (((uchar*) (A))[6])) << 8) +\
-                                    (((uint32) (((uchar*) (A))[5])) << 16) +\
-                                    (((uint32) (((uchar*) (A))[4])) << 24)) +\
-                        (((ulonglong) (((uint32) (((uchar*) (A))[3])) +\
-                                    (((uint32) (((uchar*) (A))[2])) << 8) +\
-                                    (((uint32) (((uchar*) (A))[1])) << 16) +\
-                                    (((uint32) (((uchar*) (A))[0])) << 24))) <<\
+#define mi_uint8korr(A) ((ulonglong)(((uint32) (((const uchar*) (A))[7])) +\
+                                    (((uint32) (((const uchar*) (A))[6])) << 8) +\
+                                    (((uint32) (((const uchar*) (A))[5])) << 16) +\
+                                    (((uint32) (((const uchar*) (A))[4])) << 24)) +\
+                        (((ulonglong) (((uint32) (((const uchar*) (A))[3])) +\
+                                    (((uint32) (((const uchar*) (A))[2])) << 8) +\
+                                    (((uint32) (((const uchar*) (A))[1])) << 16) +\
+                                    (((uint32) (((const uchar*) (A))[0])) << 24))) <<\
                                     32))
 
 /* This one is for uniformity */
@@ -135,85 +135,85 @@
                               ((uchar*) (T))[3]= ((uchar*) &A)[3]; }
 
 #define mi_float4get(V,M)   { float def_temp;\
-                              ((uchar*) &def_temp)[0]= ((uchar*) (M))[0];\
-                              ((uchar*) &def_temp)[1]= ((uchar*) (M))[1];\
-                              ((uchar*) &def_temp)[2]= ((uchar*) (M))[2];\
-                              ((uchar*) &def_temp)[3]= ((uchar*) (M))[3];\
+                              ((uchar*) &def_temp)[0]= ((const uchar*) (M))[0];\
+                              ((uchar*) &def_temp)[1]= ((const uchar*) (M))[1]; \
+                              ((uchar*) &def_temp)[2]= ((const uchar*) (M))[2];\
+                              ((uchar*) &def_temp)[3]= ((const uchar*) (M))[3];\
                               (V)= def_temp; }
 
-#define mi_float8store(T,V) { ((uchar*) (T))[0]= ((uchar*) &V)[0];\
-                              ((uchar*) (T))[1]= ((uchar*) &V)[1];\
-                              ((uchar*) (T))[2]= ((uchar*) &V)[2];\
-                              ((uchar*) (T))[3]= ((uchar*) &V)[3];\
-                              ((uchar*) (T))[4]= ((uchar*) &V)[4];\
-                              ((uchar*) (T))[5]= ((uchar*) &V)[5];\
-                              ((uchar*) (T))[6]= ((uchar*) &V)[6];\
-                              ((uchar*) (T))[7]= ((uchar*) &V)[7]; }
+#define mi_float8store(T,V) { ((uchar*) (T))[0]= ((const uchar*) &V)[0];\
+                              ((uchar*) (T))[1]= ((const uchar*) &V)[1];\
+                              ((uchar*) (T))[2]= ((const uchar*) &V)[2];\
+                              ((uchar*) (T))[3]= ((const uchar*) &V)[3];\
+                              ((uchar*) (T))[4]= ((const uchar*) &V)[4];\
+                              ((uchar*) (T))[5]= ((const uchar*) &V)[5];\
+                              ((uchar*) (T))[6]= ((const uchar*) &V)[6];\
+                              ((uchar*) (T))[7]= ((const uchar*) &V)[7]; }
 
 #define mi_float8get(V,M)   { double def_temp;\
-                              ((uchar*) &def_temp)[0]= ((uchar*) (M))[0];\
-                              ((uchar*) &def_temp)[1]= ((uchar*) (M))[1];\
-                              ((uchar*) &def_temp)[2]= ((uchar*) (M))[2];\
-                              ((uchar*) &def_temp)[3]= ((uchar*) (M))[3];\
-                              ((uchar*) &def_temp)[4]= ((uchar*) (M))[4];\
-                              ((uchar*) &def_temp)[5]= ((uchar*) (M))[5];\
-                              ((uchar*) &def_temp)[6]= ((uchar*) (M))[6];\
-                              ((uchar*) &def_temp)[7]= ((uchar*) (M))[7]; \
+                              ((uchar*) &def_temp)[0]= ((const uchar*) (M))[0];\
+                              ((uchar*) &def_temp)[1]= ((const uchar*) (M))[1];\
+                              ((uchar*) &def_temp)[2]= ((const uchar*) (M))[2];\
+                              ((uchar*) &def_temp)[3]= ((const uchar*) (M))[3];\
+                              ((uchar*) &def_temp)[4]= ((const uchar*) (M))[4];\
+                              ((uchar*) &def_temp)[5]= ((const uchar*) (M))[5];\
+                              ((uchar*) &def_temp)[6]= ((const uchar*) (M))[6];\
+                              ((uchar*) &def_temp)[7]= ((const uchar*) (M))[7]; \
                               (V)= def_temp; }
 #else
 
-#define mi_float4store(T,A) { ((uchar*) (T))[0]= ((uchar*) &A)[3];\
-                              ((uchar*) (T))[1]= ((uchar*) &A)[2];\
-                              ((uchar*) (T))[2]= ((uchar*) &A)[1];\
-                              ((uchar*) (T))[3]= ((uchar*) &A)[0]; }
+#define mi_float4store(T,A) { ((uchar*) (T))[0]= ((const uchar*) &A)[3];\
+                              ((uchar*) (T))[1]= ((const uchar*) &A)[2];\
+                              ((uchar*) (T))[2]= ((const uchar*) &A)[1];\
+                              ((uchar*) (T))[3]= ((const uchar*) &A)[0]; }
 
 #define mi_float4get(V,M)   { float def_temp;\
-                              ((uchar*) &def_temp)[0]= ((uchar*) (M))[3];\
-                              ((uchar*) &def_temp)[1]= ((uchar*) (M))[2];\
-                              ((uchar*) &def_temp)[2]= ((uchar*) (M))[1];\
-                              ((uchar*) &def_temp)[3]= ((uchar*) (M))[0];\
+                              ((uchar*) &def_temp)[0]= ((const uchar*) (M))[3];\
+                              ((uchar*) &def_temp)[1]= ((const uchar*) (M))[2];\
+                              ((uchar*) &def_temp)[2]= ((const uchar*) (M))[1];\
+                              ((uchar*) &def_temp)[3]= ((const uchar*) (M))[0];\
                               (V)= def_temp; }
 
 #if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN)
-#define mi_float8store(T,V) { ((uchar*) (T))[0]= ((uchar*) &V)[3];\
-                              ((uchar*) (T))[1]= ((uchar*) &V)[2];\
-                              ((uchar*) (T))[2]= ((uchar*) &V)[1];\
-                              ((uchar*) (T))[3]= ((uchar*) &V)[0];\
-                              ((uchar*) (T))[4]= ((uchar*) &V)[7];\
-                              ((uchar*) (T))[5]= ((uchar*) &V)[6];\
-                              ((uchar*) (T))[6]= ((uchar*) &V)[5];\
-                              ((uchar*) (T))[7]= ((uchar*) &V)[4];}
+#define mi_float8store(T,V) { ((uchar*) (T))[0]= ((const uchar*) &V)[3];\
+                              ((uchar*) (T))[1]= ((const uchar*) &V)[2];\
+                              ((uchar*) (T))[2]= ((const uchar*) &V)[1];\
+                              ((uchar*) (T))[3]= ((const uchar*) &V)[0];\
+                              ((uchar*) (T))[4]= ((const uchar*) &V)[7];\
+                              ((uchar*) (T))[5]= ((const uchar*) &V)[6];\
+                              ((uchar*) (T))[6]= ((const uchar*) &V)[5];\
+                              ((uchar*) (T))[7]= ((const uchar*) &V)[4];}
 
 #define mi_float8get(V,M)   { double def_temp;\
-                              ((uchar*) &def_temp)[0]= ((uchar*) (M))[3];\
-                              ((uchar*) &def_temp)[1]= ((uchar*) (M))[2];\
-                              ((uchar*) &def_temp)[2]= ((uchar*) (M))[1];\
-                              ((uchar*) &def_temp)[3]= ((uchar*) (M))[0];\
-                              ((uchar*) &def_temp)[4]= ((uchar*) (M))[7];\
-                              ((uchar*) &def_temp)[5]= ((uchar*) (M))[6];\
-                              ((uchar*) &def_temp)[6]= ((uchar*) (M))[5];\
-                              ((uchar*) &def_temp)[7]= ((uchar*) (M))[4];\
+                              ((uchar*) &def_temp)[0]= ((const uchar*) (M))[3];\
+                              ((uchar*) &def_temp)[1]= ((const uchar*) (M))[2];\
+                              ((uchar*) &def_temp)[2]= ((const uchar*) (M))[1];\
+                              ((uchar*) &def_temp)[3]= ((const uchar*) (M))[0];\
+                              ((uchar*) &def_temp)[4]= ((const uchar*) (M))[7];\
+                              ((uchar*) &def_temp)[5]= ((const uchar*) (M))[6];\
+                              ((uchar*) &def_temp)[6]= ((const uchar*) (M))[5];\
+                              ((uchar*) &def_temp)[7]= ((const uchar*) (M))[4];\
                               (V)= def_temp; }
 
 #else
-#define mi_float8store(T,V) { ((uchar*) (T))[0]= ((uchar*) &V)[7];\
-                              ((uchar*) (T))[1]= ((uchar*) &V)[6];\
-                              ((uchar*) (T))[2]= ((uchar*) &V)[5];\
-                              ((uchar*) (T))[3]= ((uchar*) &V)[4];\
-                              ((uchar*) (T))[4]= ((uchar*) &V)[3];\
-                              ((uchar*) (T))[5]= ((uchar*) &V)[2];\
-                              ((uchar*) (T))[6]= ((uchar*) &V)[1];\
-                              ((uchar*) (T))[7]= ((uchar*) &V)[0];}
+#define mi_float8store(T,V) { ((uchar*) (T))[0]= ((const uchar*) &V)[7];\
+                              ((uchar*) (T))[1]= ((const uchar*) &V)[6];\
+                              ((uchar*) (T))[2]= ((const uchar*) &V)[5];\
+                              ((uchar*) (T))[3]= ((const uchar*) &V)[4];\
+                              ((uchar*) (T))[4]= ((const uchar*) &V)[3];\
+                              ((uchar*) (T))[5]= ((const uchar*) &V)[2];\
+                              ((uchar*) (T))[6]= ((const uchar*) &V)[1];\
+                              ((uchar*) (T))[7]= ((const uchar*) &V)[0];}
 
 #define mi_float8get(V,M)   { double def_temp;\
-                              ((uchar*) &def_temp)[0]= ((uchar*) (M))[7];\
-                              ((uchar*) &def_temp)[1]= ((uchar*) (M))[6];\
-                              ((uchar*) &def_temp)[2]= ((uchar*) (M))[5];\
-                              ((uchar*) &def_temp)[3]= ((uchar*) (M))[4];\
-                              ((uchar*) &def_temp)[4]= ((uchar*) (M))[3];\
-                              ((uchar*) &def_temp)[5]= ((uchar*) (M))[2];\
-                              ((uchar*) &def_temp)[6]= ((uchar*) (M))[1];\
-                              ((uchar*) &def_temp)[7]= ((uchar*) (M))[0];\
+                              ((uchar*) &def_temp)[0]= ((const uchar*) (M))[7];\
+                              ((uchar*) &def_temp)[1]= ((const uchar*) (M))[6];\
+                              ((uchar*) &def_temp)[2]= ((const uchar*) (M))[5];\
+                              ((uchar*) &def_temp)[3]= ((const uchar*) (M))[4];\
+                              ((uchar*) &def_temp)[4]= ((const uchar*) (M))[3];\
+                              ((uchar*) &def_temp)[5]= ((const uchar*) (M))[2];\
+                              ((uchar*) &def_temp)[6]= ((const uchar*) (M))[1];\
+                              ((uchar*) &def_temp)[7]= ((const uchar*) (M))[0];\
                               (V)= def_temp; }
 #endif /* __FLOAT_WORD_ORDER */
 #endif /* WORDS_BIGENDIAN */
@@ -226,7 +226,7 @@
 #else
 #define mi_rowstore(T,A)    { mi_int4store(T, 0);\
                               mi_int4store(((uchar*) (T) + 4), A); }
-#define mi_rowkorr(T)       mi_uint4korr((uchar*) (T) + 4)
+#define mi_rowkorr(T)       mi_uint4korr((const uchar*) (T) + 4)
 #endif
 
 #if SIZEOF_OFF_T > 4
@@ -237,6 +237,6 @@
                                 bfill((char*) (T), 8, 255);\
                               else { mi_int4store((T), 0);\
                                      mi_int4store(((T) + 4), A); }}
-#define mi_sizekorr(T)      mi_uint4korr((uchar*) (T) + 4)
+#define mi_sizekorr(T)      mi_uint4korr((const uchar*) (T) + 4)
 #endif
 #endif /* MYISAMPACK_INCLUDED */