From: Georg Brandl <georg@python.org>
Date: Sun, 1 Aug 2010 14:25:22 +0000 (+0000)
Subject: #6439: fix argument type for PySys_SetArgvEx() and Py_SetProgramName() in Demo/embed... 
X-Git-Tag: v3.2a2~566
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=272fc1023aa8e2eab7c369e6a5647915013459a3;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Demo/embed/Makefile b/Demo/embed/Makefile
index 273df3037309..b02772fd7432 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 dc8bcf04fcbc..8d92820794d1 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 2f7fe621c933..4a341fdf5221 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; */