Merge branch 'master' into package-management

Conflicts: build/jam/HaikuImage src/system/kernel/arch/x86/64/arch.S
2013-05-12 00:18:19 +02:00
parent 3c94ecf6b4 88cc420211
commit c663ca2171
322 changed files with 4776 additions and 2867 deletions
@@ -137,6 +137,7 @@ typedef	generic_addr_t			generic_size_t;
 /* off_t */
 #define B_PRIdOFF		B_PRId64
 #define B_PRIiOFF		B_PRIi64
+#define B_PRIxOFF		B_PRIx64
 /* dev_t */
 #define B_PRIdDEV		B_PRId32
 #define B_PRIiDEV		B_PRIi32