[DRBD-cvs] user by phil; Made it to compile on Alphas with Linux-...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	drbdadm_main.c 


Log Message:
Made it to compile on Alphas with Linux-2.4.x

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.55
retrieving revision 1.1.2.56
diff -u -3 -r1.1.2.55 -r1.1.2.56
--- drbdadm_main.c	1 Jul 2004 08:32:03 -0000	1.1.2.55
+++ drbdadm_main.c	3 Jul 2004 11:38:11 -0000	1.1.2.56
@@ -647,7 +647,7 @@
     ep = hsearch(e, FIND);
     fprintf(stderr, "%s:%d: in resource %s, on %s:\n\t"
 		    "IP %s not found on this host.\n",
-	    config_file,(int) ep->data,res->name, res->me->name,my_ip);
+	    config_file,(int)(long)ep->data,res->name, res->me->name,my_ip);
 #ifdef INVALID_IP_IS_INVALID_CONF
     config_valid = 0;
 #endif
@@ -679,7 +679,7 @@
     asprintf(&e.key,"%s:%s",his_ip,res->peer->port);
     ep = hsearch(e, FIND);
     fprintf(stderr, "%s:%d: in resource %s:\n\tNo route from me (%s) to peer (%s).\n",
-	    config_file,(int) ep->data,res->name, my_ip, his_ip);
+	    config_file,(int)(long)ep->data,res->name, my_ip, his_ip);
 # ifdef INVALID_IP_IS_INVALID_CONF
     config_valid = 0;
 # endif
@@ -720,7 +720,7 @@
     exit(E_thinko);
   }
 #endif
-  e.data = (void*)fline;
+  e.data = (void*)(long)fline;
   ep = hsearch(e, FIND);
   // fprintf(stderr,"%s: FIND %s: %p\n",res->name,e.key,ep);
   if (ep) {
@@ -729,7 +729,7 @@
 	      "%s:%d: conflicting use of %s '%s' ...\n"
 	      "%s:%d: %s '%s' first used here.\n",
 	      config_file, line, what, ep->key,
-	      config_file, (int) ep->data, what, ep->key );
+	      config_file, (int)(long)ep->data, what, ep->key );
     }
     free(e.key);
     config_valid = 0;