Merge branch 'master' of github.com:ThrowTheSwitch/Unity

Conflicts:
	src/unity_internals.h
This commit is contained in:
John Van Enk
2012-06-20 20:03:36 -04:00
3 changed files with 8 additions and 3 deletions
+4
View File
@@ -155,6 +155,10 @@ typedef _US64 _U_SINT;
// Pointer Support
//-------------------------------------------------------
#ifndef UNITY_POINTER_WIDTH
#define UNITY_POINTER_WIDTH (32)
#endif /* UNITY_POINTER_WIDTH */
#if (UNITY_POINTER_WIDTH == 32)
typedef _UU32 _UP;
#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32