Index: uspace/lib/c/arch/abs32le/include/types.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/types.h	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/c/arch/abs32le/include/types.h	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -51,4 +51,5 @@
 typedef uint32_t size_t;
 
+typedef int32_t intptr_t;
 typedef uint32_t uintptr_t;
 typedef uint32_t atomic_count_t;
Index: uspace/lib/c/arch/amd64/include/types.h
===================================================================
--- uspace/lib/c/arch/amd64/include/types.h	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/c/arch/amd64/include/types.h	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -51,4 +51,5 @@
 typedef uint64_t size_t;
 
+typedef int64_t intptr_t;
 typedef uint64_t uintptr_t;
 typedef uint64_t atomic_count_t;
Index: uspace/lib/c/arch/arm32/include/types.h
===================================================================
--- uspace/lib/c/arch/arm32/include/types.h	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/c/arch/arm32/include/types.h	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -52,4 +52,5 @@
 typedef uint32_t size_t;
 
+typedef int32_t intptr_t;
 typedef uint32_t uintptr_t;
 typedef uint32_t atomic_count_t;
Index: uspace/lib/c/arch/ia32/include/types.h
===================================================================
--- uspace/lib/c/arch/ia32/include/types.h	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/c/arch/ia32/include/types.h	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -51,4 +51,5 @@
 typedef uint32_t size_t;
 
+typedef int32_t intptr_t;
 typedef uint32_t uintptr_t;
 typedef uint32_t atomic_count_t;
Index: uspace/lib/c/arch/ia64/include/types.h
===================================================================
--- uspace/lib/c/arch/ia64/include/types.h	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/c/arch/ia64/include/types.h	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -61,4 +61,5 @@
 typedef uint64_t size_t;
 
+typedef int64_t intptr_t;
 typedef uint64_t uintptr_t;
 typedef uint64_t atomic_count_t;
Index: uspace/lib/c/arch/mips32/include/types.h
===================================================================
--- uspace/lib/c/arch/mips32/include/types.h	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/c/arch/mips32/include/types.h	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -52,4 +52,5 @@
 typedef uint32_t size_t;
 
+typedef int32_t intptr_t;
 typedef uint32_t uintptr_t;
 typedef uint32_t atomic_count_t;
Index: uspace/lib/c/arch/ppc32/include/types.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/types.h	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/c/arch/ppc32/include/types.h	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -51,4 +51,5 @@
 typedef uint32_t size_t;
 
+typedef int32_t intptr_t;
 typedef uint32_t uintptr_t;
 typedef uint32_t atomic_count_t;
Index: uspace/lib/c/arch/sparc64/include/types.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/types.h	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/c/arch/sparc64/include/types.h	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -51,4 +51,5 @@
 typedef uint64_t size_t;
 
+typedef int64_t intptr_t;
 typedef uint64_t uintptr_t;
 typedef uint64_t atomic_count_t;
Index: uspace/lib/posix/unistd.c
===================================================================
--- uspace/lib/posix/unistd.c	(revision 65b4aac15b1c57d6782e3c1c43f292d515d42239)
+++ uspace/lib/posix/unistd.c	(revision df217a60e9e80dbb838631098d7babbacb1554ba)
@@ -89,6 +89,11 @@
 {
 	/* Always returns false, because there is no easy way to find
+<<<<<<< TREE
      * out under HelenOS. */
 	return 0;
+=======
+	 * out under HelenOS. */
+	return false;
+>>>>>>> MERGE-SOURCE
 }