cvs: ZendEngine2 / acinclude.m4 zend_float.h

http://cvs.php.net/viewvc.cgi/ZendEngine2/acinclude.m4?r1=1.21&r2=1.22&diff_format=u
Index: ZendEngine2/acinclude.m4
diff -u ZendEngine2/acinclude.m4:1.21 ZendEngine2/acinclude.m4:1.22
--- ZendEngine2/acinclude.m4:1.21	Tue Dec  2 16:03:30 2008
+++ ZendEngine2/acinclude.m4	Tue Dec  2 16:17:44 2008
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.21 2008/12/02 16:03:30 cseiler Exp $
+dnl $Id: acinclude.m4,v 1.22 2008/12/02 16:17:44 cseiler Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -131,7 +131,7 @@
      double d = div (2877.0, 1000000.0);
      char buf[255];
      sprintf(buf, "%.30f", d);
-     // see if the result is actually in double precision
+     /* see if the result is actually in double precision */
      return strncmp(buf, "0.00287699", 10) == 0 ? 0 : 1;
    }
   ]], [ac_cfp_have__fpu_setcw=yes], [ac_cfp_have__fpu_setcw=no])
@@ -163,7 +163,7 @@
      double d = div (2877.0, 1000000.0);
      char buf[255];
      sprintf(buf, "%.30f", d);
-     // see if the result is actually in double precision
+     /* see if the result is actually in double precision */
      return strncmp(buf, "0.00287699", 10) == 0 ? 0 : 1;
    }
   ]], [ac_cfp_have_fpsetprec=yes], [ac_cfp_have_fpsetprec=no])
@@ -195,7 +195,7 @@
      double d = div (2877.0, 1000000.0);
      char buf[255];
      sprintf(buf, "%.30f", d);
-     // see if the result is actually in double precision
+     /* see if the result is actually in double precision */
      return strncmp(buf, "0.00287699", 10) == 0 ? 0 : 1;
    }
   ]], [ac_cfp_have__controlfp=yes], [ac_cfp_have__controlfp=no])
@@ -228,7 +228,7 @@
      double d = div (2877.0, 1000000.0);
      char buf[255];
      sprintf(buf, "%.30f", d);
-     // see if the result is actually in double precision
+     /* see if the result is actually in double precision */
      return strncmp(buf, "0.00287699", 10) == 0 ? 0 : 1;
    }
   ]], [ac_cfp_have__controlfp_s=yes], [ac_cfp_have__controlfp_s=no])
@@ -263,7 +263,7 @@
      double d = div (2877.0, 1000000.0);
      char buf[255];
      sprintf(buf, "%.30f", d);
-     // see if the result is actually in double precision
+     /* see if the result is actually in double precision */
      return strncmp(buf, "0.00287699", 10) == 0 ? 0 : 1;
    }
   ]], [ac_cfp_have_fpu_inline_asm_x86=yes], [ac_cfp_have_fpu_inline_asm_x86=no])
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_float.h?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/zend_float.h
diff -u ZendEngine2/zend_float.h:1.1 ZendEngine2/zend_float.h:1.2
--- ZendEngine2/zend_float.h:1.1	Tue Dec  2 16:03:30 2008
+++ ZendEngine2/zend_float.h	Tue Dec  2 16:17:44 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_float.h,v 1.1 2008/12/02 16:03:30 cseiler Exp $ */
+/* $Id: zend_float.h,v 1.2 2008/12/02 16:17:44 cseiler Exp $ */
 
 #ifndef ZEND_FLOAT_H
 #define ZEND_FLOAT_H
@@ -66,22 +66,22 @@
     MSVC via compile time define.
 */
 
-// MSVC detection (MSVC people usually don't use autoconf)
+/* MSVC detection (MSVC people usually don't use autoconf) */
 #ifdef _MSC_VER
 # if _MSC_VER >= 1500
-   // Visual C++ 2008 or higher, supports _controlfp_s
+   /* Visual C++ 2008 or higher, supports _controlfp_s */
 #  define HAVE__CONTROLFP_S
 # else
-   // Visual C++ (up to 2005), supports _controlfp
+   /* Visual C++ (up to 2005), supports _controlfp */
 #  define HAVE__CONTROLFP
-# endif // MSC_VER >= 1500
-  // Tell MSVC optimizer that we access FP environment
+# endif /* MSC_VER >= 1500 */
+  /* Tell MSVC optimizer that we access FP environment */
 # pragma fenv_access (on)
-#endif // _MSC_VER
+#endif /* _MSC_VER */
 
 #ifdef HAVE__CONTROLFP_S
 
-// float.h defines _controlfp_s
+/* float.h defines _controlfp_s */
 # include <float.h>
 
 # define XPFPA_DECLARE \
@@ -97,8 +97,8 @@
             _xpfpa_fpu_oldcw = _xpfpa_fpu_cw; \
             _controlfp_s(&_xpfpa_fpu_cw, _PC_24, _MCW_PC); \
         } while (0)
-// NOTE: This only sets internal precision. MSVC does NOT support double-
-// extended precision!
+/* NOTE: This only sets internal precision. MSVC does NOT support double-
+   extended precision! */
 # define XPFPA_SWITCH_DOUBLE_EXTENDED() do { \
             _controlfp_s(&_xpfpa_fpu_cw, 0, 0); \
             _xpfpa_fpu_oldcw = _xpfpa_fpu_cw; \
@@ -106,10 +106,10 @@
         } while (0)
 # define XPFPA_RESTORE() \
             _controlfp_s(&_xpfpa_fpu_cw, _xpfpa_fpu_oldcw, _MCW_PC)
-// We do NOT use the volatile return trick since _controlfp_s is a function
-// call and thus FP registers are saved in memory anyway. However, we do use
-// a variable to ensure that the expression passed into val will be evaluated
-// *before* switching back contexts.
+/* We do NOT use the volatile return trick since _controlfp_s is a function
+   call and thus FP registers are saved in memory anyway. However, we do use
+   a variable to ensure that the expression passed into val will be evaluated
+   *before* switching back contexts. */
 # define XPFPA_RETURN_DOUBLE(val) \
             do { \
                 double _xpfpa_result = (val); \
@@ -122,7 +122,7 @@
                 XPFPA_RESTORE(); \
                 return _xpfpa_result; \
             } while (0)
-// This won't work, but we add a macro for it anyway.
+/* This won't work, but we add a macro for it anyway. */
 # define XPFPA_RETURN_DOUBLE_EXTENDED(val) \
             do { \
                 long double _xpfpa_result = (val); \
@@ -132,7 +132,7 @@
 
 #elif defined(HAVE__CONTROLFP)
 
-// float.h defines _controlfp
+/* float.h defines _controlfp */
 # include <float.h>
 
 # define XPFPA_DECLARE \
@@ -146,17 +146,17 @@
             _xpfpa_fpu_oldcw = _controlfp(0, 0); \
             _controlfp(_PC_24, _MCW_PC); \
         } while (0)
-// NOTE: This will only work as expected on MinGW.
+/* NOTE: This will only work as expected on MinGW. */
 # define XPFPA_SWITCH_DOUBLE_EXTENDED() do { \
             _xpfpa_fpu_oldcw = _controlfp(0, 0); \
             _controlfp(_PC_64, _MCW_PC); \
         } while (0)
 # define XPFPA_RESTORE() \
             _controlfp(_xpfpa_fpu_oldcw, _MCW_PC)
-// We do NOT use the volatile return trick since _controlfp is a function
-// call and thus FP registers are saved in memory anyway. However, we do use
-// a variable to ensure that the expression passed into val will be evaluated
-// *before* switching back contexts.
+/* We do NOT use the volatile return trick since _controlfp is a function
+   call and thus FP registers are saved in memory anyway. However, we do use
+   a variable to ensure that the expression passed into val will be evaluated
+   *before* switching back contexts. */
 # define XPFPA_RETURN_DOUBLE(val) \
             do { \
                 double _xpfpa_result = (val); \
@@ -169,7 +169,7 @@
                 XPFPA_RESTORE(); \
                 return _xpfpa_result; \
             } while (0)
-// This will only work on MinGW
+/* This will only work on MinGW */
 # define XPFPA_RETURN_DOUBLE_EXTENDED(val) \
             do { \
                 long double _xpfpa_result = (val); \
@@ -177,9 +177,9 @@
                 return _xpfpa_result; \
             } while (0)
 
-#elif defined(HAVE__FPU_SETCW) // glibc systems
+#elif defined(HAVE__FPU_SETCW) /* glibc systems */
 
-// fpu_control.h defines _FPU_[GS]ETCW
+/* fpu_control.h defines _FPU_[GS]ETCW */
 # include <fpu_control.h>
 
 # define XPFPA_DECLARE \
@@ -202,9 +202,9 @@
         } while (0)
 # define XPFPA_RESTORE() \
             _FPU_SETCW(_xpfpa_fpu_oldcw)
-// We use a temporary volatile variable (in a new block) in order to ensure
-// that the optimizer does not mis-optimize the instructions. Also, a volatile
-// variable ensures truncation to correct precision.
+/* We use a temporary volatile variable (in a new block) in order to ensure
+   that the optimizer does not mis-optimize the instructions. Also, a volatile
+   variable ensures truncation to correct precision. */
 # define XPFPA_RETURN_DOUBLE(val) \
             do { \
                 volatile double _xpfpa_result = (val); \
@@ -224,9 +224,9 @@
                 return _xpfpa_result; \
             } while (0)
 
-#elif defined(HAVE_FPSETPREC) // FreeBSD
+#elif defined(HAVE_FPSETPREC) /* FreeBSD */
 
-// fpu_control.h defines _FPU_[GS]ETCW
+/* fpu_control.h defines _FPU_[GS]ETCW */
 # include <machine/ieeefp.h>
 
 # define XPFPA_DECLARE \
@@ -246,9 +246,9 @@
         } while (0)
 # define XPFPA_RESTORE() \
             fpsetprec(_xpfpa_fpu_oldprec)
-// We use a temporary volatile variable (in a new block) in order to ensure
-// that the optimizer does not mis-optimize the instructions. Also, a volatile
-// variable ensures truncation to correct precision.
+/* We use a temporary volatile variable (in a new block) in order to ensure
+   that the optimizer does not mis-optimize the instructions. Also, a volatile
+   variable ensures truncation to correct precision. */
 # define XPFPA_RETURN_DOUBLE(val) \
             do { \
                 volatile double _xpfpa_result = (val); \
@@ -312,9 +312,9 @@
         } while (0)
 # define XPFPA_RESTORE() \
             __asm__ __volatile__ ("fldcw %0" : : "m" (*&_xpfpa_fpu_oldcw))
-// We use a temporary volatile variable (in a new block) in order to ensure
-// that the optimizer does not mis-optimize the instructions. Also, a volatile
-// variable ensures truncation to correct precision.
+/* We use a temporary volatile variable (in a new block) in order to ensure
+   that the optimizer does not mis-optimize the instructions. Also, a volatile
+   variable ensures truncation to correct precision. */
 # define XPFPA_RETURN_DOUBLE(val) \
             do { \
                 volatile double _xpfpa_result = (val); \
@@ -334,7 +334,7 @@
                 return _xpfpa_result; \
             } while (0)
 
-#else // FPU CONTROL
+#else /* FPU CONTROL */
 
 /*
   This is either not an x87 FPU or the inline assembly syntax was not
@@ -350,6 +350,6 @@
 # define XPFPA_RETURN_SINGLE(val)           return (val)
 # define XPFPA_RETURN_DOUBLE_EXTENDED(val)  return (val)
 
-#endif // FPU CONTROL
+#endif /* FPU CONTROL */
 
 #endif