Merge branch 'master' into gfio

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 8246e38856a22321fae6bcab9410ed401f64cabd..95d9d77c555b6cc044e9cb485003b25535e8c3e3 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -314,7 +314,7 @@ extern int shm_id;
 extern int groupid;
 extern int terse_output;
 extern int temp_stall_ts;
-extern unsigned long page_mask, page_size;
+extern uintptr_t page_mask, page_size;
 extern int read_only;
 extern int eta_print;
 extern unsigned long done_secs;