[pypy-svn] r25378 - pypy/dist/pypy/translator/c/src

[mwh at codespeak.net]

Author: mwh
Date: Wed Apr  5 15:00:08 2006
New Revision: 25378

Modified:
   pypy/dist/pypy/translator/c/src/float.h
Log:
duh, brain-free conflict resolution thinko.


Modified: pypy/dist/pypy/translator/c/src/float.h
==============================================================================
--- pypy/dist/pypy/translator/c/src/float.h	(original)
+++ pypy/dist/pypy/translator/c/src/float.h	Wed Apr  5 15:00:08 2006
@@ -26,7 +26,7 @@
 #define OP_FLOAT_ADD(x,y,r)     r = x + y
 #define OP_FLOAT_SUB(x,y,r)     r = x - y
 #define OP_FLOAT_MUL(x,y,r)     r = x * y
-#define OP_FLOAT_TRUEDIV(x,y,r) OP_FLOAT_DIV(x,y,r)
+#define OP_FLOAT_TRUEDIV(x,y,r) r = x / y
 #define OP_FLOAT_POW(x,y,r)     r = pow(x, y) 
 
 /*** conversions ***/