commit

diff --git a/meta b/meta
index c9de933ca4d68d9f09ac70a09ade39668a96f75d..1f925de0a9fa11a6fe3da547b1c4e488bfa641ac 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: e47ce15c5029e4867ba364d76c16dd703ef0744e
+Previous: e9f772c3b8671233cff289c949bbd07b558e3ffa
 Head: caa3348fa47c2828097b9f547342e554f6232b29
 Applied:
-  typecast: 70f2e5779fba924958bf02008a052f41ffcc25f5
   v1-0-16: caa3348fa47c2828097b9f547342e554f6232b29
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/typecast b/patches/typecast
deleted file mode 100644 (file)
index e065863..0000000
--- a/patches/typecast
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: b0d26700067fa09254ee8df365690f91fd2ac5fb
-Top:    d90f6a06ceeb5ffd6ef8cc2c97fe0494dcd7f238
-Author: Hal Rosenstock <hal@mellanox.com>
-Date:   2012-07-12 09:24:10 -0700
-
-librspreload: Fix typecast to eliminate compile warnings
-
-src/preload.c: In function ?bind?:
-src/preload.c:350: warning: assignment from incompatible pointer type
-src/preload.c: In function ?connect?:
-src/preload.c:397: warning: assignment from incompatible pointer type
-
-Signed-off-by: Hal Rosenstock <hal@mellanox.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 8758d5c..2750b30 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -347,7 +347,7 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
-       int fd, ret;
- 
-       if (fd_get(socket, &fd) == fd_rsocket) {
--              sin = (struct sockaddr_sin *) addr;
-+              sin = (struct sockaddr_in *) addr;
-               if (!sin->sin_port || ntohs(sin->sin_port) > 1024)
-                       return rbind(fd, addr, addrlen);
- 
-@@ -394,7 +394,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
-       int fd, ret;
- 
-       if (fd_get(socket, &fd) == fd_rsocket) {
--              sin = (struct sockaddr_sin *) addr;
-+              sin = (struct sockaddr_in *) addr;
-               if (ntohs(sin->sin_port) > 1024) {
-                       ret = rconnect(fd, addr, addrlen);
-                       if (!ret || errno == EINPROGRESS)