diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 14:25:22 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 14:25:22 (GMT) |
| commit | 272fc1023aa8e2eab7c369e6a5647915013459a3 (patch) | |
| tree | 1a5648e286586456fada3f1074eff2aadcee6c93 | |
| parent | 5b1d35b9c74d726536afdd60cf629fba5bd66425 (diff) | |
| download | cpython-272fc1023aa8e2eab7c369e6a5647915013459a3.zip cpython-272fc1023aa8e2eab7c369e6a5647915013459a3.tar.gz cpython-272fc1023aa8e2eab7c369e6a5647915013459a3.tar.bz2 | |
#6439: fix argument type for PySys_SetArgvEx() and Py_SetProgramName() in Demo/embed code.
| -rw-r--r-- | Demo/embed/Makefile | 2 | ||||
| -rw-r--r-- | Demo/embed/demo.c | 4 | ||||
| -rw-r--r-- | Demo/embed/loop.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Demo/embed/Makefile b/Demo/embed/Makefile index 273df30..b02772f 100644 --- a/Demo/embed/Makefile +++ b/Demo/embed/Makefile @@ -22,7 +22,7 @@ CPPFLAGS= $(INCLUDES) LIBPYTHON= $(blddir)/libpython$(VERSION).a # XXX edit LIBS (in particular) to match $(blddir)/Makefile -LIBS= -lnsl -ldl -lreadline -ltermcap -lieee -lpthread -lutil +LIBS= -lnsl -ldl -lreadline -lieee -lpthread -lutil LDFLAGS= -Xlinker -export-dynamic SYSLIBS= -lm MODLIBS= diff --git a/Demo/embed/demo.c b/Demo/embed/demo.c index dc8bcf0..8d92820 100644 --- a/Demo/embed/demo.c +++ b/Demo/embed/demo.c @@ -22,7 +22,7 @@ main(int argc, char **argv) /* Define sys.argv. It is up to the application if you want this; you can also leave it undefined (since the Python code is generally not a main program it has no business - touching sys.argv...) + touching sys.argv...) If the third argument is true, sys.path is modified to include either the directory containing the script named by argv[0], or @@ -32,7 +32,7 @@ main(int argc, char **argv) directory (say, a file named os.py) that your application would then import and run. */ - PySys_SetArgvEx(argc, argv, 0); + PySys_SetArgvEx(2, args, 0); /* Do some application specific code */ printf("Hello, brave new world\n\n"); diff --git a/Demo/embed/loop.c b/Demo/embed/loop.c index 2f7fe62..4a341fd 100644 --- a/Demo/embed/loop.c +++ b/Demo/embed/loop.c @@ -19,7 +19,7 @@ main(int argc, char **argv) count = atoi(argv[2]); } - Py_SetProgramName(argv[0]); + Py_SetProgramName(L"loop"); /* uncomment this if you don't want to load site.py */ /* Py_NoSiteFlag = 1; */ |