===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca-27.h,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM_contrib2/asir2000/include/ca-27.h	2000/08/22 05:04:15	1.3
+++ OpenXM_contrib2/asir2000/include/ca-27.h	2015/08/14 13:51:55	1.8
@@ -45,20 +45,18 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/include/ca-27.h,v 1.2 2000/08/21 08:31:36 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca-27.h,v 1.7 2015/08/06 10:01:52 fujimoto Exp $ 
 */
-#if LONG_IS_32BIT
-#if defined(VISUAL)
-typedef _int64 L;
-typedef unsigned _int64 UL;
-#else
+#if SIZEOF_LONG == 8
+typedef long L;
+typedef unsigned long UL;
+#elif defined(HAVE_UNSIGNED_LONG_LONG)
 typedef long long L;
 typedef unsigned long long UL;
+#elif defined(_MSC_VER)
+typedef _int64 L;
+typedef unsigned _int64 UL;
 #endif
-#else
-typedef long L;
-typedef unsigned long UL;
-#endif
 /* data structures */
 
 #define O_N 1
@@ -72,7 +70,7 @@ struct oN {
 
 typedef struct oN *N;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <string.h>
 #define index(s,c) strchr(s,c)
 #define bzero(s,len) memset(s,0,len)