[pypy-svn] r14411 - pypy/dist/pypy/translator/c

[arigo at codespeak.net]

Author: arigo
Date: Thu Jul  7 21:20:16 2005
New Revision: 14411

Modified:
   pypy/dist/pypy/translator/c/extfunc_include.h
   pypy/dist/pypy/translator/c/fixedname.py
   pypy/dist/pypy/translator/c/g_exception.h
Log:
Oups again.  Need a clean way to detect if we have an RTyper or not.


Modified: pypy/dist/pypy/translator/c/extfunc_include.h
==============================================================================
--- pypy/dist/pypy/translator/c/extfunc_include.h	(original)
+++ pypy/dist/pypy/translator/c/extfunc_include.h	Thu Jul  7 21:20:16 2005
@@ -2,7 +2,7 @@
  /***  C header subsection: external functions             ***/
 
 /******************************************************************/
-#ifdef RPyString        /* not defined if we don't have an RTyper */
+#ifdef HAVE_RTYPER      /* not defined if we don't have an RTyper */
 /******************************************************************/
 
 
@@ -45,5 +45,5 @@
 
 
 /******************************************************************/
-#endif                                               /* RPyString */
+#endif                                             /* HAVE_RTYPER */
 /******************************************************************/

Modified: pypy/dist/pypy/translator/c/fixedname.py
==============================================================================
--- pypy/dist/pypy/translator/c/fixedname.py	(original)
+++ pypy/dist/pypy/translator/c/fixedname.py	Thu Jul  7 21:20:16 2005
@@ -72,6 +72,7 @@
         typename = db.gettype(lowleveltype)
         return 'typedef %s;' % cdecl(typename, c_typename)
 
+    yield '#define HAVE_RTYPER'
     for c_name, obj in predeclare_all(db, rtyper):
         if isinstance(obj, LowLevelType):
             yield predeclaretype(c_name, obj)

Modified: pypy/dist/pypy/translator/c/g_exception.h
==============================================================================
--- pypy/dist/pypy/translator/c/g_exception.h	(original)
+++ pypy/dist/pypy/translator/c/g_exception.h	Thu Jul  7 21:20:16 2005
@@ -6,7 +6,7 @@
 
 
 /******************************************************************/
-#ifdef RPYTHON_EXCEPTION_MATCH   /* RPython version of exceptions */
+#ifdef HAVE_RTYPER               /* RPython version of exceptions */
 /******************************************************************/
 
 static RPYTHON_EXCEPTION_VTABLE	rpython_exc_type = NULL;
@@ -96,5 +96,5 @@
 		PyErr_SetString(Py##exc, msg)    /* pun */
 
 /******************************************************************/
-#endif                                 /* RPYTHON_EXCEPTION_MATCH */
+#endif                                             /* HAVE_RTYPER */
 /******************************************************************/