[Python-checkins] python/dist/src/Include symtable.h,2.16,2.17

[nnorwitz@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29439/Include

Modified Files:
	symtable.h 
Log Message:
Do not pollute name block_ty, prefix with _Py_

Index: symtable.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/symtable.h,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- symtable.h	23 Oct 2005 18:37:16 -0000	2.16
+++ symtable.h	24 Oct 2005 00:30:44 -0000	2.17
@@ -5,7 +5,7 @@
 #endif
 
 typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock }
-    block_ty;
+    _Py_block_ty;
 
 struct _symtable_entry;
 
@@ -29,7 +29,7 @@
 	PyObject *ste_name;      /* string: name of block */
 	PyObject *ste_varnames;  /* list of variable names */
 	PyObject *ste_children;  /* list of child ids */
-	block_ty ste_type;       /* module, class, or function */
+	_Py_block_ty ste_type;   /* module, class, or function */
 	int ste_unoptimized;     /* false if namespace is optimized */
 	int ste_nested : 1;      /* true if block is nested */
 	int ste_free : 1;        /* true if block has free variables */
@@ -49,7 +49,7 @@
 #define PySTEntry_Check(op) ((op)->ob_type == &PySTEntry_Type)
 
 PyAPI_FUNC(PySTEntryObject *) \
-	PySTEntry_New(struct symtable *, identifier, block_ty, void *, int);
+	PySTEntry_New(struct symtable *, identifier, _Py_block_ty, void *, int);
 PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *);
 
 PyAPI_FUNC(struct symtable *) PySymtable_Build(mod_ty, const char *,