===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/io.c,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -p -r1.9 -r1.13
--- OpenXM_contrib2/asir2000/io/io.c	2001/10/09 01:36:20	1.9
+++ OpenXM_contrib2/asir2000/io/io.c	2009/03/13 04:45:16	1.13
@@ -44,12 +44,12 @@
  * 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.8 2000/08/29 04:03:05 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/io.c,v 1.12 2003/03/07 06:39:57 noro Exp $ 
 */
 #include <stdio.h>
 #include "ca.h"
 #include "parse.h"
-#if defined(VISUAL) || MPI
+#if defined(VISUAL) || defined(MPI)
 #include "wsio.h"
 #endif
 
@@ -141,7 +141,7 @@ int gen_fread (char *ptr,int size,int nitems,FILE *str
 		if ( _fileno(stream) < 0 )
 			n = cread(ptr,size,nitems,(STREAM *)stream);
 		else
-#elif MPI
+#elif defined(MPI)
 		if ( (char)fileno(stream) < 0 )
 			n = cread(ptr,size,nitems,(STREAM *)stream);
 		else
@@ -175,7 +175,7 @@ int gen_fwrite (char *ptr,int size,int nitems,FILE *st
 	if ( _fileno(stream) < 0 )
 		return cwrite(ptr,size,nitems,(STREAM *)stream);
 	else
-#elif MPI
+#elif defined(MPI)
 	if ( (char)fileno(stream) < 0 )
 		return cwrite(ptr,size,nitems,(STREAM *)stream);
 	else
@@ -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];
 
@@ -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];