This patch fixes various issues with too long constants not fitting 32 bits,

and causing some code to be disabled unexpectedly (#2147)

diff --git a/lnet/lnet/lib-ni.c b/lnet/lnet/lib-ni.c
index aa30329..9e90576 100644 (file)
--- a/lnet/lnet/lib-ni.c
+++ b/lnet/lnet/lib-ni.c
@@ -27,7 +27,7 @@
 #include <portals/lib-p30.h>
 #include <portals/arg-blocks.h>
 
-#define MAX_DIST 18446744073709551615UL
+#define MAX_DIST 18446744073709551615ULL
 
 int do_PtlNIDebug(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 {

diff --git a/lustre/portals/portals/lib-ni.c b/lustre/portals/portals/lib-ni.c
index aa30329..9e90576 100644 (file)
--- a/lustre/portals/portals/lib-ni.c
+++ b/lustre/portals/portals/lib-ni.c
@@ -27,7 +27,7 @@
 #include <portals/lib-p30.h>
 #include <portals/arg-blocks.h>
 
-#define MAX_DIST 18446744073709551615UL
+#define MAX_DIST 18446744073709551615ULL
 
 int do_PtlNIDebug(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 {