inttyes.h modifications

diff --git a/intel.c b/intel.c
index abfdb9da06766c31eb28de5d33b9676570fe8b95..43dc8edc7d3f36daecd70aaada12be6674a43d14 100644 (file)
--- a/intel.c
+++ b/intel.c
@@ -3214,7 +3214,7 @@ static int intel_parse_operand (char *start, char *operand_string) {
         
             switch (intel_state.operand_modifier) {
             
-                case EXPR_TYPE_NEAR_PTR:
+                case EXPR_TYPE_NEAR_PTR:    case EXPR_TYPE_FAR_PTR:
                 
                     if (intel_state.segment) {
                         is_absolute_jump = 1;
@@ -3224,7 +3224,6 @@ static int intel_parse_operand (char *start, char *operand_string) {
                     
                     break;
                 
-                case EXPR_TYPE_FAR_PTR:
                 case EXPR_TYPE_ABSENT:
                 
                     if (!intel_state.segment) {

diff --git a/inttypes.h b/inttypes.h
index b6faa21f11c134ea852d2c3493ebe0547e04802f..34d387c40df81b681f7b4ed56171046cb5394258 100644 (file)
--- a/inttypes.h
+++ b/inttypes.h
@@ -2,15 +2,14 @@
  * @file            inttypes.h
  *****************************************************************************/
 #include    <limits.h>
-#include    <stdint.h>
 
 #if     defined (NO_LONG_LONG)
 # define    I64_FMT                     "l"
-#elif   defined (_MSVC_) || defined (__WIN32__)
+#elif   defined (_MSVC_)
 # define    I64_FMT                     "I64"
 #elif   defined (__PRI_64_LENGTH_MODIFIER__)                                                        /* Mac */
 # define    I64_FMT                     __PRI_64_LENGTH_MODIFIER__
-#elif   defined (SIZEOF_LONG) && SIZEOF_LONG >= 8 || ULONG_MAX > 4294967295UL
+#elif   (defined (SIZEOF_LONG) && SIZEOF_LONG >= 8) || ULONG_MAX > 4294967295UL
 # define    I64_FMT                     "l"
 #else
 # define    I64_FMT                     "ll"