Changeset 1179 for trunk

Timestamp:

Oct 8, 2008 7:33:01 AM (16 years ago)

Author:

gah

Message:

64-bit fixes for pymolproxy

File:

• trunk/packages/vizservers/pymolproxy/pymolproxy.c (modified) (4 diffs)

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -70 +70 @@
 static int debug = FALSE;
 
-
 typedef struct {
     char *data;
@@ -422 +421 @@
 
 static int
-getline(int sock, char *buffer, int size, long timeout)
+getline(int sock, char *buffer, int size, int timeout)
 {
     int pos = 0, status, timeo;
@@ -480 +479 @@
     trace("want to match (%s)\n", string);
     while(1) {
-        if (getline(sock,buffer,length,IO_TIMEOUT) == 0) {
+        if (getline(sock,buffer,length, IO_TIMEOUT) == 0) {
             pymol->error = 2;
             pymol->status = TCL_ERROR;
@@ -1025 +1024 @@
         char fileName[200];
         FILE *f;
-        size_t nBytes, nWritten;
+        ssize_t nBytes, nWritten;
 
         sprintf(fileName, "/tmp/pymol%d.pdb", getpid());