In colamd, use int64_t instead of 'long long' as DLONG, consistent with superlu.

Author: xiaoyeli

SRC/colamd.c

@@ -2207,7 +2207,11 @@ PRIVATE Int find_ordering	/* return the number of garbage collections */
     Int col ;			/* a column index */
     Int max_score ;		/* maximum possible score */
     Int cur_score ;		/* score of current column */
+#ifdef DLONG
+    uint64_t hash ; 	        /* hash value for supernode detection */
+#else
     unsigned Int hash ;		/* hash value for supernode detection */
+#endif
     Int head_column ;		/* head of hash bucket */
     Int first_col ;		/* first column in hash bucket */
     Int tag_mark ;		/* marker value for mark array */

SRC/colamd.h

@@ -55,24 +55,25 @@ at the top-level directory.
 #ifndef COLAMD_H
 #define COLAMD_H
 
-#include "superlu_config.h"
 
 /* make it easy for C++ programs to include COLAMD */
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined ( _LONGINT )
-#define DLONG
-#endif
-
-
 /* ========================================================================== */
 /* === Include files ======================================================== */
 /* ========================================================================== */
 
 #include <stdlib.h>
-    /*#include <stdint.h>*/
+//#include <inttypes.h>
+#include <stdint.h>
+#include "superlu_config.h"
+
+#if defined ( _LONGINT )
+#define DLONG
+#endif
+
 
 /* ========================================================================== */
 /* === COLAMD version ======================================================= */
@@ -175,9 +176,9 @@ extern "C" {
 #define SuiteSparse_long_idd "ld"
 #endif
 
-#if 1
+#if 0
 #define SuiteSparse_long long long int
-#else
+#else  // Sherry switch to this
 #define SuiteSparse_long int64_t
 #endif
 #define SuiteSparse_long_max LONG_MAX