Fix definition of some constants when sizeof(long)==4

Author: wegank

src/fglm/fglm_core.c

@@ -504,15 +504,15 @@ static inline void sparse_mat_fglm_mult_vec(CF_t *res, sp_matfglm_t *mat,
   nmod_t mod;
   uint64_t pow2_precomp;
   nmod_init(&mod, (uint64_t)prime);
-  NMOD_RED(pow2_precomp, (UWORD(1) << __DOT_SPLIT_BITS), mod);
+  NMOD_RED(pow2_precomp, (UINT64_C(1) << __DOT_SPLIT_BITS), mod);
 
   _avx512_matrix_vector_product(vres, mat->dense_mat, vec, mat->dst,
                               ncols, nrows, mod, pow2_precomp, st);
 #elif defined(HAVE_AVX2)
   nmod_t mod;
   uint64_t pow2_precomp;
   nmod_init(&mod, (uint64_t)prime);
-  NMOD_RED(pow2_precomp, (UWORD(1) << __DOT_SPLIT_BITS), mod);
+  NMOD_RED(pow2_precomp, (UINT64_C(1) << __DOT_SPLIT_BITS), mod);
 
   _avx2_matrix_vector_product(vres, mat->dense_mat, vec, mat->dst,
                               ncols, nrows, mod, pow2_precomp, st);
@@ -565,15 +565,15 @@ static inline void sparse_mat_fglm_colon_mult_vec(CF_t *res, sp_matfglmcol_t *ma
   nmod_t mod;
   uint64_t pow2_precomp;
   nmod_init(&mod, (uint64_t)prime);
-  NMOD_RED(pow2_precomp, (UWORD(1) << __DOT_SPLIT_BITS), mod);
+  NMOD_RED(pow2_precomp, (UINT64_C(1) << __DOT_SPLIT_BITS), mod);
 
   _avx512_matrix_vector_product(vres, mat->dense_mat, vec, mat->dst,
                               ncols, nrows, mod, pow2_precomp, st);
 #elif defined(HAVE_AVX2)
   nmod_t mod;
   uint64_t pow2_precomp;
   nmod_init(&mod, (uint64_t)prime);
-  NMOD_RED(pow2_precomp, (UWORD(1) << __DOT_SPLIT_BITS), mod);
+  NMOD_RED(pow2_precomp, (UINT64_C(1) << __DOT_SPLIT_BITS), mod);
 
   _avx2_matrix_vector_product(vres, mat->dense_mat, vec, mat->dst,
                               ncols, nrows, mod, pow2_precomp, st);

src/fglm/linalg-fglm.c

@@ -40,7 +40,7 @@
 
 // parameters for splitting
 #define __DOT_SPLIT_BITS 56
-#define __DOT_SPLIT_MASK 72057594037927935UL // (1UL << __DOT_SPLIT_BITS) - 1
+#define __DOT_SPLIT_MASK UINT64_C(72057594037927935) // (1ULL << __DOT_SPLIT_BITS) - 1
 
 /*--------------------------------------*/
 /* non-vectorized matrix vector product */