summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-05-06 15:24:59 (GMT)
committerGuido van Rossum <guido@python.org>1997-05-06 15:24:59 (GMT)
commit478e718acaed0e11f7be491187bf142ed551d98d (patch)
tree06d9e0ce28ac3989079919fc2ff4f15c7340255d /Python
parentb819914263bdbd216189aac698016b6373984735 (diff)
downloadcpython-478e718acaed0e11f7be491187bf142ed551d98d.zip
cpython-478e718acaed0e11f7be491187bf142ed551d98d.tar.gz
cpython-478e718acaed0e11f7be491187bf142ed551d98d.tar.bz2
Keep MS compiler happy: use (int)strlen() when comparing; make sure
not to use kill().
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f08a2c4..8bb7565 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -57,6 +57,12 @@ PERFORMANCE OF THIS SOFTWARE.
#include "windows.h"
#endif
+#ifdef HAVE_GETPID
+#ifndef MS_WINDOWS
+#define HAVE_KILL
+#endif
+#endif
+
extern char *Py_GetPath();
extern grammar _PyParser_Grammar; /* From graminit.c */
@@ -370,7 +376,7 @@ PyErr_Print()
if (text != NULL) {
char *nl;
if (offset > 0 &&
- offset == strlen(text))
+ offset == (int)strlen(text))
offset--;
for (;;) {
nl = strchr(text, '\n');
@@ -728,7 +734,7 @@ sighandler(sig)
{
signal(sig, SIG_DFL); /* Don't catch recursive signals */
Py_Cleanup(); /* Do essential clean-up */
-#ifdef HAVE_GETPID
+#ifdef HAVE_KILL
kill(getpid(), sig); /* Pretend the signal killed us */
#else
exit(1);