[61401] branches/release_1_8

[jmr at macports.org]

Revision: 61401
          http://trac.macports.org/changeset/61401
Author:   jmr at macports.org
Date:     2009-12-10 06:13:00 -0800 (Thu, 10 Dec 2009)
Log Message:
-----------
merge r61385 from trunk:
 64-bitterness

Revision Links:
--------------
    http://trac.macports.org/changeset/61385

Modified Paths:
--------------
    branches/release_1_8/base/src/pextlib1.0/tty.c

Property Changed:
----------------
    branches/release_1_8/
    branches/release_1_8/base/


Property changes on: branches/release_1_8
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,56147,56160,56162,56435,56448,57026,57255,57436,57441,57784,57801,57871,57974,58445,59318,59585,60259-60260,60798,61302
   + /trunk:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,56147,56160,56162,56435,56448,57026,57255,57436,57441,57784,57801,57871,57974,58445,59318,59585,60259-60260,60798,61302,61385


Property changes on: branches/release_1_8/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56472-56474,56666,56889,57026,57048,57055,57131,57255,57436,57441,57784,57801,57820,57871,57974,57979,57982,58093,58445,59318,59585,60259-60260,60798,61302
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56160,56162,56435,56448,56472-56474,56666,56889,57026,57048,57055,57131,57255,57436,57441,57784,57801,57820,57871,57974,57979,57982,58093,58445,59318,59585,60259-60260,60798,61302,61385
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/src/pextlib1.0/tty.c
===================================================================
--- branches/release_1_8/base/src/pextlib1.0/tty.c	2009-12-10 13:54:19 UTC (rev 61400)
+++ branches/release_1_8/base/src/pextlib1.0/tty.c	2009-12-10 14:13:00 UTC (rev 61401)
@@ -53,7 +53,7 @@
     Tcl_Obj *tcl_result;
     Tcl_Channel chan;
     int dir;
-    int fd;
+    ClientData fd;
     int rval;
 
     if (objc != 2) {
@@ -69,11 +69,11 @@
 
     if (Tcl_GetChannelHandle(chan,
             dir & TCL_READABLE ? TCL_READABLE : TCL_WRITABLE,
-            (ClientData*) &fd) == TCL_ERROR) {
+            &fd) == TCL_ERROR) {
         return TCL_ERROR;
     }
 
-    rval = isatty(fd);
+    rval = isatty((int)(intptr_t)fd);
 
     tcl_result = Tcl_NewIntObj(rval);
     Tcl_SetObjResult(interp, tcl_result);
@@ -87,7 +87,7 @@
     Tcl_Obj *tcl_result;
     Tcl_Channel chan;
     int dir;
-    int fd;
+    ClientData fd;
     Tcl_Obj *robjv[2];
     struct winsize ws = {0, 0, 0, 0};
 
@@ -104,16 +104,16 @@
 
     if (Tcl_GetChannelHandle(chan,
             dir & TCL_READABLE ? TCL_READABLE : TCL_WRITABLE,
-            (ClientData*) &fd) == TCL_ERROR) {
+            &fd) == TCL_ERROR) {
         return TCL_ERROR;
     }
 
-    if (!isatty(fd)) {
+    if (!isatty((int)(intptr_t)fd)) {
         Tcl_SetResult(interp, "channel is not connected to a tty", TCL_STATIC);
         return TCL_ERROR;
     }
 
-    if (ioctl(fd, TIOCGWINSZ, &ws) == -1) {
+    if (ioctl((int)(intptr_t)fd, TIOCGWINSZ, &ws) == -1) {
         Tcl_SetResult(interp, "ioctl failed", TCL_STATIC);
         return TCL_ERROR;
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091210/465fe595/attachment.html>