X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FHpc.c;h=00b5a3d6c0f9e0ed05d40623fe2fddbc7c3f0109;hb=4afc3a50c27ae4ac4bbd5a11f2f3c95bae45d778;hp=cf75a05847a5cb8ec7708224a8fb17d49a815827;hpb=a2a67cd520b9841114d69a87a423dabcb3b4368e;p=ghc-hetmet.git diff --git a/rts/Hpc.c b/rts/Hpc.c index cf75a05..00b5a3d 100644 --- a/rts/Hpc.c +++ b/rts/Hpc.c @@ -36,13 +36,6 @@ static pid_t hpc_pid = 0; // pid of this process at hpc-boot time. static FILE *tixFile; // file being read/written static int tix_ch; // current char -// This is a cruel hack, we should completely redesign the format specifier handling in the RTS. -#if SIZEOF_LONG == 8 -#define PRIuWORD64 "lu" -#else -#define PRIuWORD64 "llu" -#endif - HpcModuleInfo *modules = 0; HpcModuleInfo *nextModule = 0; int totalTixes = 0; // total number of tix boxes. @@ -200,7 +193,7 @@ static void hpc_init(void) { /* Then, try open the file */ tixFilename = (char *) malloc(strlen(hpc_tixdir) + strlen(prog_name) + 12); - sprintf(tixFilename,"%s/%s-%d.tix",hpc_tixdir,prog_name,hpc_pid); + sprintf(tixFilename,"%s/%s-%d.tix",hpc_tixdir,prog_name,(int)hpc_pid); } else { tixFilename = (char *) malloc(strlen(prog_name) + 6); sprintf(tixFilename, "%s.tix", prog_name); @@ -333,7 +326,7 @@ writeTix(FILE *f) { } if (tmpModule->tixArr) { - fprintf(f,"%" PRIuWORD64,tmpModule->tixArr[i]); + fprintf(f,"%" FMT_Word64,tmpModule->tixArr[i]); } else { fprintf(f,"0"); }