Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

make some freezing related stuff const

This commit is contained in:
Benjamin Peterson 2013-03-13 14:06:39 -05:00
parent 327992330e
commit 7701e6ef93
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Include/import.h
View File

@ -113,15 +113,15 @@ PyAPI_FUNC(int) PyImport_AppendInittab(
#ifndef Py_LIMITED_API #ifndef Py_LIMITED_API
struct _frozen { struct _frozen {
char *name; /* ASCII encoded string */ const char *name; /* ASCII encoded string */
unsigned char *code; const unsigned char *code;
int size; int size;
}; };
/* Embedding apps may change this pointer to point to their favorite /* Embedding apps may change this pointer to point to their favorite
collection of frozen modules: */ collection of frozen modules: */
PyAPI_DATA(struct _frozen *) PyImport_FrozenModules; PyAPI_DATA(const struct _frozen *) PyImport_FrozenModules;
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

6
Modules/_freeze_importlib.c
View File

@ -17,7 +17,7 @@
of frozen modules instead, left deliberately blank so as to avoid of frozen modules instead, left deliberately blank so as to avoid
unintentional import of a stale version of _frozen_importlib. */ unintentional import of a stale version of _frozen_importlib. */
static struct _frozen _PyImport_FrozenModules[] = { const static struct _frozen _PyImport_FrozenModules[] = {
{0, 0, 0} /* sentinel */ {0, 0, 0} /* sentinel */
}; };
@ -25,7 +25,7 @@ static struct _frozen _PyImport_FrozenModules[] = {
/* On Windows, this links with the regular pythonXY.dll, so this variable comes /* On Windows, this links with the regular pythonXY.dll, so this variable comes
from frozen.obj. In the Makefile, frozen.o is not linked into this executable, from frozen.obj. In the Makefile, frozen.o is not linked into this executable,
so we define the variable here. */ so we define the variable here. */
struct _frozen *PyImport_FrozenModules; const struct _frozen *PyImport_FrozenModules;
#endif #endif
const char header[] = "/* Auto-generated by Modules/_freeze_importlib.c */"; const char header[] = "/* Auto-generated by Modules/_freeze_importlib.c */";
@ -105,7 +105,7 @@ main(int argc, char *argv[])
return 1; return 1;
} }
fprintf(outfile, "%s\n", header); fprintf(outfile, "%s\n", header);
fprintf(outfile, "unsigned char _Py_M__importlib[] = {\n"); fprintf(outfile, "const unsigned char _Py_M__importlib[] = {\n");
for (n = 0; n < data_size; n += 16) { for (n = 0; n < data_size; n += 16) {
size_t i, end = Py_MIN(n + 16, data_size); size_t i, end = Py_MIN(n + 16, data_size);
fprintf(outfile, " "); fprintf(outfile, " ");

4
Python/frozen.c
View File

@ -28,7 +28,7 @@ static unsigned char M___hello__[] = {
#define SIZE (int)sizeof(M___hello__) #define SIZE (int)sizeof(M___hello__)
static struct _frozen _PyImport_FrozenModules[] = { static const struct _frozen _PyImport_FrozenModules[] = {
/* importlib */ /* importlib */
{"_frozen_importlib", _Py_M__importlib, (int)sizeof(_Py_M__importlib)}, {"_frozen_importlib", _Py_M__importlib, (int)sizeof(_Py_M__importlib)},
/* Test module */ /* Test module */
@ -42,4 +42,4 @@ static struct _frozen _PyImport_FrozenModules[] = {
/* Embedding apps may change this pointer to point to their favorite /* Embedding apps may change this pointer to point to their favorite
collection of frozen modules: */ collection of frozen modules: */
struct _frozen *PyImport_FrozenModules = _PyImport_FrozenModules; const struct _frozen *PyImport_FrozenModules = _PyImport_FrozenModules;

2
Python/importlib.h
View File

@ -1,5 +1,5 @@
/* Auto-generated by Modules/_freeze_importlib.c */ /* Auto-generated by Modules/_freeze_importlib.c */
unsigned char _Py_M__importlib[] = { const unsigned char _Py_M__importlib[] = {
99,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0, 99,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,
0,64,0,0,0,115,229,3,0,0,100,0,0,90,0,0, 0,64,0,0,0,115,229,3,0,0,100,0,0,90,0,0,
100,130,0,90,1,0,100,4,0,100,5,0,132,0,0,90, 100,130,0,90,1,0,100,4,0,100,5,0,132,0,0,90,