* timemodule.c: Add hack for Solaris 2.

* posixmodule.c: don't prototype getcwd() -- it's not portable...
* mappingobject.c: double-check validity of last_name_char in
  dict{lookup,insert,remove}.
* arraymodule.c: need memmove only for non-STDC Suns.
* Makefile: comment out HTML_LIBS and XT_USE by default
* pythonmain.c: don't prototype getopt() -- it's not standardized
* socketmodule.c: cast flags arg to {get,set}sockopt() and addrbuf arg to
  recvfrom() to (ANY*).
* pythonrun.c (initsigs): fix prototype, make it static
* intobject.c (LONG_BIT): only #define it if not already defined
* classobject.[ch]: remove all references to unused instance_convert()
* mappingobject.c (getmappingsize): Don't return NULL in int function.

diff --git a/Include/classobject.h b/Include/classobject.h
index aa1cb6bf43ca645ab6c3d4cd26eb44a5c94a7764..a244ef80d9c221608735f6f0ac1e5f785d942e73 100644 (file)
--- a/Include/classobject.h
+++ b/Include/classobject.h
@@ -59,8 +59,6 @@ extern object *instancemethodgetfunc PROTO((object *));
 extern object *instancemethodgetself PROTO((object *));
 extern object *instancemethodgetclass PROTO((object *));
 
-extern object *instance_convert PROTO((object *, char *));
-
 extern int issubclass PROTO((object *, object *));
 
 #ifdef __cplusplus

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 5b62fee4c0216051b7dbf764263b658429e748f7..925a52d2ef6b71c563cdabd7d0035d3012a1c5c1 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -37,7 +37,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 extern char *memcpy();
 #endif
 
-#ifdef sun
+#if defined(sun) && !defined(__STDC__)
 /* SunOS doesn't have memmove */
 #define NEED_MEMMOVE
 extern char *memcpy();

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 00b83698fffbb2e8321fcb90529f5961d0e096ab..b82e492f12836c30fb6fa51118aab51b611fae7e 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -58,7 +58,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef SYSV
 
-#define UTIME_STRUCT
+#define UTIME_STRUCT 1
 #include <dirent.h>
 #define direct dirent
 #ifdef i386
@@ -89,7 +89,7 @@ extern int mkdir PROTO((const char *, mode_t));
 extern int chdir PROTO((const char *));
 extern int rmdir PROTO((const char *));
 extern int chmod PROTO((const char *, mode_t));
-extern char *getcwd PROTO((char *, int)); /* XXX or size_t? */
+extern char *getcwd(); /* No PROTO((char *, int)) -- non portable */
 #ifndef MSDOS
 extern char *strerror PROTO((int));
 extern int link PROTO((const char *, const char *));

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index dfdf97ba21d4228cc450e0397c57dad6d0821c07..3fc875535f0541082bbc1d774d2f4a91883c38bf 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -388,7 +388,7 @@ sock_allowbroadcast(s, args)
        if (!getargs(args, "i", &flag))
                return NULL;
        res = setsockopt(s->sock_fd, SOL_SOCKET, SO_BROADCAST,
-                        &flag, sizeof flag);
+                        (ANY *)&flag, sizeof flag);
        if (res < 0)
                return socket_error();
        INCREF(None);
@@ -422,7 +422,7 @@ sock_setsockopt(s, args)
                if (!getargs(args, "(iis#)", &level, &optname, &buf, &buflen))
                        return NULL;
        }
-       res = setsockopt(s->sock_fd, level, optname, buf, buflen);
+       res = setsockopt(s->sock_fd, level, optname, (ANY *)buf, buflen);
        if (res < 0)
                return socket_error();
        INCREF(None);
@@ -450,7 +450,8 @@ sock_getsockopt(s, args)
        if (getargs(args, "(ii)", &level, &optname)) {
                int flag = 0;
                int flagsize = sizeof flag;
-               res = getsockopt(s->sock_fd, level, optname, &flag, &flagsize);
+               res = getsockopt(s->sock_fd, level, optname,
+                                (ANY *)&flag, &flagsize);
                if (res < 0)
                        return socket_error();
                return newintobject(flag);
@@ -465,8 +466,8 @@ sock_getsockopt(s, args)
        buf = newsizedstringobject((char *)NULL, buflen);
        if (buf == NULL)
                return NULL;
-       res = getsockopt(s->sock_fd, level, optname, getstringvalue(buf),
-                        &buflen);
+       res = getsockopt(s->sock_fd, level, optname,
+                        (ANY *)getstringvalue(buf), &buflen);
        if (res < 0) {
                DECREF(buf);
                return socket_error();
@@ -720,7 +721,7 @@ sock_recvfrom(s, args)
                return NULL;
        BGN_SAVE
        n = recvfrom(s->sock_fd, getstringvalue(buf), len, flags,
-                    addrbuf, &addrlen);
+                    (ANY *)addrbuf, &addrlen);
        END_SAVE
        if (n < 0)
                return socket_error();

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 5bf1340caf3492ca74ffbb81f223053a84ba462f..5406907d670638d79a111c1f5b764a452012e9a4 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -72,6 +72,13 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif /* !unix */
 
 #ifdef SYSV
+#if defined(sun) && defined(__STDC__)
+/* Temporary hack for Solaris 2. */
+#define _timezone timezone
+#define _altzone altzone
+#define _daylight daylight
+#define _tzname tzname
+#endif
 /* Access timezone stuff */
 #ifdef OLDTZ                           /* ANSI prepends underscore to these */
 #define _timezone      timezone        /* seconds to be added to GMT */

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 60089995df60610c289ef4882d651d82ad5bc45f..268cf1ac5134df42a5f660cc414be42084fb9a07 100644 (file)
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -960,14 +960,6 @@ typeobject Instancetype = {
        instance_hash,          /*tp_hash*/
 };
 
-static object *
-instance_convert(inst, methodname)
-       object *inst;
-       char *methodname;
-{
-       return generic_unary_op((instanceobject *)inst, methodname);
-}
-
 
 /* Instance method objects are used for two purposes:
    (a) as bound instance methods (returned by instancename.methodname)

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 65512beb2b33d1d215ec3b87dbec8786c683ae09..972560d57a16b3b63c7671d860f2ca4efe622eca 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -572,7 +572,7 @@ getmappingsize(mp)
 {
        if (mp == NULL || !is_mappingobject(mp)) {
                err_badcall();
-               return NULL;
+               return 0;
        }
        return ((mappingobject *)mp)->ma_used;
 }
@@ -773,7 +773,7 @@ dictlookup(v, key)
        object *v;
        char *key;
 {
-       if (key != last_name_char) {
+       if (key != last_name_char || strcmp(key, getstringvalue(last_name_object)) != 0) {
                XDECREF(last_name_object);
                last_name_object = newstringobject(key);
                if (last_name_object == NULL) {
@@ -791,7 +791,7 @@ dictinsert(v, key, item)
        char *key;
        object *item;
 {
-       if (key != last_name_char) {
+       if (key != last_name_char || strcmp(key, getstringvalue(last_name_object)) != 0) {
                XDECREF(last_name_object);
                last_name_object = newstringobject(key);
                if (last_name_object == NULL) {
@@ -808,7 +808,8 @@ dictremove(v, key)
        object *v;
        char *key;
 {
-       if (key != last_name_char) {
+       if (key != last_name_char ||
+           strcmp(key, getstringvalue(last_name_object)) != 0) {
                XDECREF(last_name_object);
                last_name_object = newstringobject(key);
                if (last_name_object == NULL) {

diff --git a/Objects/intobject.c b/Objects/intobject.c
index 2953ffad3c7500166719b6d6d5124ba1bb2deab6..e9c35d7273de470fb86fd8fddab1b14e1994a231 100644 (file)
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -43,7 +43,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define CHAR_BIT 8
 #endif
 
+#ifndef LONG_BIT
 #define LONG_BIT (CHAR_BIT * sizeof(long))
+#endif
 
 /* Standard Booleans */
 

diff --git a/Objects/mappingobject.c b/Objects/mappingobject.c
index 65512beb2b33d1d215ec3b87dbec8786c683ae09..972560d57a16b3b63c7671d860f2ca4efe622eca 100644 (file)
--- a/Objects/mappingobject.c
+++ b/Objects/mappingobject.c
@@ -572,7 +572,7 @@ getmappingsize(mp)
 {
        if (mp == NULL || !is_mappingobject(mp)) {
                err_badcall();
-               return NULL;
+               return 0;
        }
        return ((mappingobject *)mp)->ma_used;
 }
@@ -773,7 +773,7 @@ dictlookup(v, key)
        object *v;
        char *key;
 {
-       if (key != last_name_char) {
+       if (key != last_name_char || strcmp(key, getstringvalue(last_name_object)) != 0) {
                XDECREF(last_name_object);
                last_name_object = newstringobject(key);
                if (last_name_object == NULL) {
@@ -791,7 +791,7 @@ dictinsert(v, key, item)
        char *key;
        object *item;
 {
-       if (key != last_name_char) {
+       if (key != last_name_char || strcmp(key, getstringvalue(last_name_object)) != 0) {
                XDECREF(last_name_object);
                last_name_object = newstringobject(key);
                if (last_name_object == NULL) {
@@ -808,7 +808,8 @@ dictremove(v, key)
        object *v;
        char *key;
 {
-       if (key != last_name_char) {
+       if (key != last_name_char ||
+           strcmp(key, getstringvalue(last_name_object)) != 0) {
                XDECREF(last_name_object);
                last_name_object = newstringobject(key);
                if (last_name_object == NULL) {

diff --git a/Python/pythonmain.c b/Python/pythonmain.c
index ac1d86a1beafffde0b10d32ccd2ec52a18c12674..48ccd38309044aa080de0f5fbc7ce582d4f94afc 100644 (file)
--- a/Python/pythonmain.c
+++ b/Python/pythonmain.c
@@ -33,7 +33,7 @@ extern int killprint; /* Defined in ceval.c */
 /* Interface to getopt(): */
 extern int optind;
 extern char *optarg;
-extern int getopt PROTO((int, char **, char *));
+extern int getopt(); /* PROTO((int, char **, char *)); -- not standardized */
 
 extern char *getenv();
 

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 56254ac285d69566f7c72502167dc976164e5bd3..ac7e0400a03883eb5e3e76e84dd650521510b951 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -58,7 +58,7 @@ static object *run_node PROTO((node *n, char *filename,
                               object *globals, object *locals));
 static object *eval_node PROTO((node *n, char *filename,
                                object *globals, object *locals));
-void initsigs PROTO(());
+static void initsigs PROTO((void));
 
 int debugging; /* Needed by parser.c */
 int verbose; /* Needed by import.c */