Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 07:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Oops, missed some renamings.

Browse source
This commit is contained in:
Guido van Rossum 1997-05-07 23:51:07 +00:00
parent 6778f257b7
commit ee2373b930
5 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/regexpr.c
View file

@ -26,7 +26,7 @@ from GNU regexp.
#include "config.h" /* For Win* specific redefinition of printf c.s. */ #include "config.h" /* For Win* specific redefinition of printf c.s. */
#include "myproto.h" /* For PROTO macro --Guido */ #include "myproto.h" /* For Py_PROTO macro --Guido */
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
@ -152,7 +152,7 @@ static char re_syntax_table[256];
#endif /* emacs */ #endif /* emacs */
static void re_compile_initialize PROTO((void)); static void re_compile_initialize Py_PROTO((void));
static void re_compile_initialize() static void re_compile_initialize()
{ {
int a; int a;
@ -262,7 +262,7 @@ int syntax;
return ret; return ret;
} }
static int hex_char_to_decimal PROTO((int)); static int hex_char_to_decimal Py_PROTO((int));
static int hex_char_to_decimal(ch) static int hex_char_to_decimal(ch)
int ch; int ch;
{ {
@ -773,7 +773,7 @@ regexp_t bufp;
#undef SET_FIELDS #undef SET_FIELDS
static void re_compile_fastmap_aux static void re_compile_fastmap_aux
PROTO((char *, int, char *, char *, char *)); Py_PROTO((char *, int, char *, char *, char *));
static void re_compile_fastmap_aux(code, pos, visited, can_be_null, fastmap) static void re_compile_fastmap_aux(code, pos, visited, can_be_null, fastmap)
char *code, *visited, *can_be_null, *fastmap; char *code, *visited, *can_be_null, *fastmap;
int pos; int pos;
@ -870,7 +870,7 @@ int pos;
} }
} }
static int re_do_compile_fastmap PROTO((char *, int, int, char *, char *)); static int re_do_compile_fastmap Py_PROTO((char *, int, int, char *, char *));
static int re_do_compile_fastmap(buffer, used, pos, can_be_null, fastmap) static int re_do_compile_fastmap(buffer, used, pos, can_be_null, fastmap)
char *buffer, *fastmap, *can_be_null; char *buffer, *fastmap, *can_be_null;
int used, pos; int used, pos;

2
Parser/printgrammar.c
View file

@ -49,7 +49,7 @@ printgrammar(g, fp)
fprintf(fp, "#include \"grammar.h\"\n"); fprintf(fp, "#include \"grammar.h\"\n");
printdfas(g, fp); printdfas(g, fp);
printlabels(g, fp); printlabels(g, fp);
fprintf(fp, "grammar gram = {\n"); fprintf(fp, "grammar _PyParser_Grammar = {\n");
fprintf(fp, "\t%d,\n", g->g_ndfas); fprintf(fp, "\t%d,\n", g->g_ndfas);
fprintf(fp, "\tdfas,\n"); fprintf(fp, "\tdfas,\n");
fprintf(fp, "\t{%d, labels},\n", g->g_ll.ll_nlabels); fprintf(fp, "\t{%d, labels},\n", g->g_ll.ll_nlabels);

3
Python/getmtime.c
View file

@ -37,10 +37,9 @@ PERFORMANCE OF THIS SOFTWARE.
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "rename2.h"
long long
getmtime(path) PyOS_GetLastModificationTime(path)
char *path; char *path;
{ {
struct stat st; struct stat st;

2
Python/graminit.c
View file

@ -1445,7 +1445,7 @@ static label labels[124] = {
{1, "class"}, {1, "class"},
{312, 0}, {312, 0},
}; };
grammar gram = { grammar _PyParser_Grammar = {
57, 57,
dfas, dfas,
{124, labels}, {124, labels},

8
Python/mystrtoul.c
View file

@ -39,8 +39,6 @@ PERFORMANCE OF THIS SOFTWARE.
#define Py_CHARMASK(c) ((c) & 0xff) #define Py_CHARMASK(c) ((c) & 0xff)
#endif #endif
#include "rename2.h"
/* strtol and strtoul, renamed to avoid conflicts */ /* strtol and strtoul, renamed to avoid conflicts */
/* /*
@ -61,7 +59,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include <errno.h> #include <errno.h>
unsigned long unsigned long
mystrtoul(str, ptr, base) PyOS_strtoul(str, ptr, base)
register char * str; register char * str;
char ** ptr; char ** ptr;
int base; int base;
@ -148,7 +146,7 @@ int base;
} }
long long
mystrtol(str, ptr, base) PyOS_strtol(str, ptr, base)
char * str; char * str;
char ** ptr; char ** ptr;
int base; int base;
@ -163,7 +161,7 @@ int base;
if (sign == '+' || sign == '-') if (sign == '+' || sign == '-')
str++; str++;
result = (long) mystrtoul(str, ptr, base); result = (long) PyOS_strtoul(str, ptr, base);
/* Signal overflow if the result appears negative, /* Signal overflow if the result appears negative,
except for the largest negative integer */ except for the largest negative integer */