diff --git a/src/unity_internals.h b/src/unity_internals.h
index 9e6e321..ed6c9af 100644
--- a/src/unity_internals.h
+++ b/src/unity_internals.h
@@ -30,7 +30,7 @@
 #define ULONG_MAX    (sizeof(unsigned long) * 256 - 1)
 #endif
 #ifndef UINTPTR_MAX
-#define UINTPTR_MAX  ULONG_MAX  //apparently this is not a constant expression: (sizeof(unsigned int *) * 256 - 1)
+//apparently this is not a constant expression: (sizeof(unsigned int *) * 256 - 1) so we have to just let this fall through
 #endif
 #endif
 //-------------------------------------------------------
@@ -100,7 +100,7 @@
   #endif
 #endif
 #ifndef UNITY_POINTER_WIDTH
-  #define UNITY_POINTER_WIDTH (32)
+  #define UNITY_POINTER_WIDTH UNITY_LONG_WIDTH
 #endif
 
 //-------------------------------------------------------
diff --git a/targets/gcc_32.yml b/targets/gcc_32.yml
index 5f46c60..11c98aa 100644
--- a/targets/gcc_32.yml
+++ b/targets/gcc_32.yml
@@ -24,6 +24,8 @@ compiler:
       - UNITY_EXCLUDE_SIZEOF
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES
+      - UNITY_INT_WIDTH=32
+      - UNITY_LONG_WIDTH=32
   object_files:
     prefix: '-o'
     extension: '.o'
diff --git a/targets/gcc_64.yml b/targets/gcc_64.yml
index 6d8dda2..518b3b5 100644
--- a/targets/gcc_64.yml
+++ b/targets/gcc_64.yml
@@ -25,6 +25,8 @@ compiler:
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES
       - UNITY_SUPPORT_64
+      - UNITY_INT_WIDTH=32
+      - UNITY_LONG_WIDTH=64
   object_files:
     prefix: '-o'
     extension: '.o'