Author: amassari
Date: Sat Sep 30 15:09:49 2006
New Revision: 451683

URL: http://svn.apache.org/viewvc?view=rev&rev=451683
Log:
Fixed detection of 16 and 32-bit integers on Cygwin

Modified:
    xerces/c/trunk/m4/xerces_int_types.m4

Modified: xerces/c/trunk/m4/xerces_int_types.m4
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_int_types.m4?view=diff&rev=451683&r1=451682&r2=451683
==============================================================================
--- xerces/c/trunk/m4/xerces_int_types.m4 (original)
+++ xerces/c/trunk/m4/xerces_int_types.m4 Sat Sep 30 15:09:49 2006
@@ -28,13 +28,15 @@
                AS_IF([test x$ac_cv_header_inttypes_h = xyes && test 
x$ac_cv_type_int16_t = xyes],
                        [xerces_cv_type_s16bit_int=int16_t],
                        [
-                               if test $ac_cv_sizeof_int -eq 2; then
-                                       xerces_cv_type_s16bit_int=int
-                               elif test $ac_cv_sizeof_short -eq 2; then
-                                       xerces_cv_type_s16bit_int=short
-                               else
-                                       AC_MSG_ERROR([Couldn't find a signed 16 
bit int type])
-                               fi
+                               case $ac_cv_sizeof_int in
+                               2*) xerces_cv_type_s16bit_int=int;;
+                               *)  
+                                       case $ac_cv_sizeof_short in
+                                       2*) xerces_cv_type_s16bit_int=short;;
+                                       *)  AC_MSG_ERROR([Couldn't find a 
signed 16 bit int type]);;
+                                       esac
+                                       ;;
+                               esac
                        ])
        ])
        
@@ -45,13 +47,15 @@
                AS_IF([test x$ac_cv_header_inttypes_h = xyes && test 
x$ac_cv_type_uint16_t = xyes],
                        [xerces_cv_type_u16bit_int=uint16_t],
                        [
-                               if test $ac_cv_sizeof_int -eq 2; then
-                                       xerces_cv_type_u16bit_int="unsigned int"
-                               elif test $ac_cv_sizeof_short -eq 2; then
-                                       xerces_cv_type_u16bit_int="unsigned 
short"
-                               else
-                                       AC_MSG_ERROR([Couldn't find an unsigned 
16 bit int type])
-                               fi
+                               case $ac_cv_sizeof_int in
+                               2*) xerces_cv_type_u16bit_int="unsigned int";;
+                               *)  
+                                       case $ac_cv_sizeof_short in
+                                       2*) xerces_cv_type_u16bit_int="unsigned 
short";;
+                                       *)  AC_MSG_ERROR([Couldn't find an 
unsigned 16 bit int type]);;
+                                       esac
+                                       ;;
+                               esac
                        ])
        ])
        
@@ -63,13 +67,15 @@
                AS_IF([test x$ac_cv_header_inttypes_h = xyes && test 
x$ac_cv_type_int32_t = xyes],
                        [xerces_cv_type_s32bit_int=int32_t],
                        [
-                               if test $ac_cv_sizeof_int -eq 4; then
-                                       xerces_cv_type_s32bit_int=int
-                               elif test $ac_cv_sizeof_long -eq 4; then
-                                       xerces_cv_type_s32bit_int=long
-                               else
-                                       AC_MSG_ERROR([Couldn't find a signed 32 
bit int type])
-                               fi
+                               case $ac_cv_sizeof_int in
+                               4*) xerces_cv_type_s32bit_int=int;;
+                               *)  
+                                       case $ac_cv_sizeof_long in
+                                       4*) xerces_cv_type_s32bit_int=long;;
+                                       *)  AC_MSG_ERROR([Couldn't find a 
signed 32 bit int type]);;
+                                       esac
+                                       ;;
+                               esac
                        ])
        ])
        
@@ -80,13 +86,15 @@
                AS_IF([test x$ac_cv_header_inttypes_h = xyes && test 
x$ac_cv_type_uint32_t = xyes],
                        [xerces_cv_type_u32bit_int=uint32_t],
                        [
-                               if test $ac_cv_sizeof_int -eq 4; then
-                                       xerces_cv_type_u32bit_int="unsigned int"
-                               elif test $ac_cv_sizeof_long -eq 4; then
-                                       xerces_cv_type_u32bit_int="unsigned 
long"
-                               else
-                                       AC_MSG_ERROR([Couldn't find an unsigned 
32 bit int type])
-                               fi
+                               case $ac_cv_sizeof_int in
+                               4*) xerces_cv_type_u32bit_int="unsigned int";;
+                               *)  
+                                       case $ac_cv_sizeof_long in
+                                       4*) xerces_cv_type_u32bit_int="unsigned 
long";;
+                                       *)  AC_MSG_ERROR([Couldn't find an 
unsigned 32 bit int type]);;
+                                       esac
+                                       ;;
+                               esac
                        ])
        ])              
                



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to