X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FHpc.c;h=81c802cea23991855faeaa3a7b42ab5634e1ff1e;hb=8625c675de45bdb8bcfa795572ce7c47687c147c;hp=cf75a05847a5cb8ec7708224a8fb17d49a815827;hpb=a2a67cd520b9841114d69a87a423dabcb3b4368e;p=ghc-hetmet.git

diff --git a/rts/Hpc.c b/rts/Hpc.c
index cf75a05..81c802c 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.
@@ -58,7 +51,7 @@ failure(char *msg) {
   } else {
     fprintf(stderr,"(perhaps remove .tix file?)\n");
   }
-  exit(-1);
+  stg_exit(1);
 }
 
 static int init_open(FILE *file) {
@@ -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);
@@ -242,7 +235,7 @@ hs_hpc_module(char *modName,
 	fprintf(stderr,"in module '%s'\n",tmpModule->modName);
 	failure("module mismatch with .tix/.mix file hash number");
 	fprintf(stderr,"(perhaps remove %s ?)\n",tixFilename);
-	exit(-1);
+	stg_exit(1);
 
       }
       for(i=0;i < modCount;i++) {
@@ -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");
       }