diff --git a/src/common/inc/chirp.hpp b/src/common/inc/chirp.hpp
index bc71113..cc38dfd 100755
--- a/src/common/inc/chirp.hpp
+++ b/src/common/inc/chirp.hpp
@@ -145,11 +145,7 @@
 #define FLTS64_IN(len, a)               uint32_t & len, double * a
 
 #ifndef END
-#ifdef __x86_64__
-#define END                             (int64_t)0
-#else
-#define END                             0
-#endif
+#define END                             (uintptr_t)0
 #endif
 #define END_OUT_ARGS                    END
 #define END_IN_ARGS                     END
diff --git a/src/common/inc/pixydefs.h b/src/common/inc/pixydefs.h
index eda0419..f4e5ad3 100755
--- a/src/common/inc/pixydefs.h
+++ b/src/common/inc/pixydefs.h
@@ -102,11 +102,7 @@
 #define FLTS64(len, a)                  CRP_FLTS64, len, a
 
 #ifndef END
-#ifdef __x86_64__
-#define END (int64_t)0
-#else
-#define END 0
-#endif
+#define END                             (uintptr_t)0
 #endif
 #define END_OUT_ARGS END
 #define END_IN_ARGS END