===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/io.c,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -p -r1.10 -r1.14
--- OpenXM_contrib2/asir2000/io/io.c	2003/02/14 22:29:15	1.10
+++ OpenXM_contrib2/asir2000/io/io.c	2009/03/16 16:43:03	1.14
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.9 2001/10/09 01:36:20 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.13 2009/03/13 04:45:16 ohara Exp $ 
 */
 #include <stdio.h>
 #include "ca.h"
@@ -210,7 +210,7 @@ void write_int(FILE *f,unsigned int *p)
 		gen_fwrite((char *)p,sizeof(unsigned int),1,f);
 }
 
-#if defined(VISUAL) && defined(DES_ENC)
+#if defined(DES_ENC)
 int des_encryption;
 static unsigned char asir_deskey[8] = {0xc7,0xe0,0xfc,0xb5,0xc3,0xad,0x8e,0x3a};
 static unsigned char deskey_string[96];
@@ -230,7 +230,7 @@ void write_intarray(FILE *f,unsigned int *p,int l)
 {
 	int i;
 	unsigned int t;
-#if defined(VISUAL) && defined(DES_ENC)
+#if defined(DES_ENC)
 	int l2;
 	unsigned int plain[2],encrypted[2];
 
@@ -263,7 +263,7 @@ void write_intarray(FILE *f,unsigned int *p,int l)
 		gen_fwrite((char *)p,sizeof(unsigned int),l,f);
 }
 
-#if defined(LONG_IS_64BIT)
+#if SIZEOF_LONG == 8
 void write_longarray(FILE *f,unsigned long *p,int l)
 {
 	int i;
@@ -322,7 +322,7 @@ void read_int(FILE *f,unsigned int *p)
 void read_intarray(FILE *f,unsigned int *p,int l)
 {
 	int i;
-#if defined(VISUAL) && defined(DES_ENC)
+#if defined(DES_ENC)
 	int l2;
 	unsigned int plain[2],encrypted[2];
 
@@ -353,7 +353,7 @@ void read_intarray(FILE *f,unsigned int *p,int l)
 	}
 }
 
-#if defined(LONG_IS_64BIT)
+#if SIZEOF_LONG == 8
 void read_longarray(FILE *f,unsigned long *p,int l)
 {
 	int i;