Index: generic/printf.c
===================================================================
--- generic/printf.c	(revision ce8725be1e22b7ff35142a2d2b8ba3272390cb43)
+++ generic/printf.c	(revision 2e672fd4b3d5e1a62f9cd7875f14ef43a3a5842b)
@@ -57,5 +57,5 @@
  *
  */
-static void print_fixed_hex(const __u64 num, const int width)
+static void print_fixed_hex(const uint64_t num, const int width)
 {
 	int i;
@@ -76,9 +76,9 @@
  *
  */
-static void print_number(const __native num, const unsigned int base)
+static void print_number(const unative_t num, const unsigned int base)
 {
 	int val = num;
-	char d[sizeof(__native) * 8 + 1];		/* this is good enough even for base == 2 */
-	int i = sizeof(__native) * 8 - 1;
+	char d[sizeof(unative_t) * 8 + 1];		/* this is good enough even for base == 2 */
+	int i = sizeof(unative_t) * 8 - 1;
 	
 	do {
@@ -86,5 +86,5 @@
 	} while (val /= base);
 	
-	d[sizeof(__native) * 8] = 0;	
+	d[sizeof(unative_t) * 8] = 0;	
 	puts(&d[i + 1]);
 }
@@ -183,5 +183,5 @@
 						puts("0x");
 					case 'p':
-						print_fixed_hex(va_arg(ap, __native), sizeof(__native));
+						print_fixed_hex(va_arg(ap, unative_t), sizeof(unative_t));
 						goto loop;
 					
@@ -189,5 +189,5 @@
 						puts("0x");
 					case 'q':
-						print_fixed_hex(va_arg(ap, __u64), INT64);
+						print_fixed_hex(va_arg(ap, uint64_t), INT64);
 						goto loop;
 					
@@ -195,5 +195,5 @@
 						puts("0x");
 					case 'l':
-						print_fixed_hex(va_arg(ap, __native), INT32);
+						print_fixed_hex(va_arg(ap, unative_t), INT32);
 						goto loop;
 					
@@ -201,5 +201,5 @@
 						puts("0x");
 					case 'w':
-						print_fixed_hex(va_arg(ap, __native), INT16);
+						print_fixed_hex(va_arg(ap, unative_t), INT16);
 						goto loop;
 					
@@ -207,5 +207,5 @@
 						puts("0x");
 					case 'b':
-						print_fixed_hex(va_arg(ap, __native), INT8);
+						print_fixed_hex(va_arg(ap, unative_t), INT8);
 						goto loop;
 					
@@ -214,5 +214,5 @@
 					 */
 					case 'd':
-						print_number(va_arg(ap, __native), 10);
+						print_number(va_arg(ap, unative_t), 10);
 						goto loop;
 					
@@ -220,5 +220,5 @@
 						puts("0x");
 					case 'x':
-						print_number(va_arg(ap, __native), 16);
+						print_number(va_arg(ap, unative_t), 16);
 						goto loop;