#6439: fix argument type for PySys_SetArgvEx() and Py_SetProgramName() in Demo/embed...

diff --git a/Demo/embed/Makefile b/Demo/embed/Makefile
index 273df303730955e953f16afc973bd38d5061ee49..b02772fd743241e2e1f38596d8a416e2491d5af4 100644 (file)
--- 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 dc8bcf04fcbc46b45141a0e22f8b1fe9c0184503..8d92820794d1bbad181f0d1db2ce72eaa69f24a6 100644 (file)
--- 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 2f7fe621c933755bf6678569e3cf39ac75679611..4a341fdf522134b660c003d27544d9d1414e1c9a 100644 (file)
--- 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; */