mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 19:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix #define ordering.

Browse source
This commit is contained in:
Georg Brandl 2008-01-07 18:41:34 +00:00
parent 62647653eb
commit 76b30d1688
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Parser/tokenizer.c
View file

@ -1533,7 +1533,6 @@ PyTokenizer_Get(struct tok_state *tok, char **p_start, char **p_end)
return result; return result;
} }
#ifdef Py_USING_UNICODE
/* This function is only called from parsetok. However, it cannot live /* This function is only called from parsetok. However, it cannot live
there, as it must be empty for PGEN, and we can check for PGEN only there, as it must be empty for PGEN, and we can check for PGEN only
in this file. */ in this file. */
@ -1545,6 +1544,7 @@ PyTokenizer_RestoreEncoding(struct tok_state* tok, int len, int* offset)
return NULL; return NULL;
} }
#else #else
#ifdef Py_USING_UNICODE
static PyObject * static PyObject *
dec_utf8(const char *enc, const char *text, size_t len) { dec_utf8(const char *enc, const char *text, size_t len) {
PyObject *ret = NULL; PyObject *ret = NULL;
@ -1592,10 +1592,9 @@ PyTokenizer_RestoreEncoding(struct tok_state* tok, int len, int *offset)
return text; return text;
} }
#endif /* defined(Py_USING_UNICODE) */
#endif #endif
#endif /* defined(Py_USING_UNICODE) */
#ifdef Py_DEBUG #ifdef Py_DEBUG

2
Parser/tokenizer.h
View file

@ -58,7 +58,7 @@ extern struct tok_state *PyTokenizer_FromString(const char *);
extern struct tok_state *PyTokenizer_FromFile(FILE *, char *, char *); extern struct tok_state *PyTokenizer_FromFile(FILE *, char *, char *);
extern void PyTokenizer_Free(struct tok_state *); extern void PyTokenizer_Free(struct tok_state *);
extern int PyTokenizer_Get(struct tok_state *, char **, char **); extern int PyTokenizer_Get(struct tok_state *, char **, char **);
#ifdef Py_USING_UNICODE #if defined(PGEN) || defined(Py_USING_UNICODE)
extern char * PyTokenizer_RestoreEncoding(struct tok_state* tok, extern char * PyTokenizer_RestoreEncoding(struct tok_state* tok,
int len, int *offset); int len, int *offset);
#endif #endif