cygwin-patch: deleted changes in loop.c

This commit is contained in:
vvaltman 2015-06-17 12:37:51 +03:00
parent 491deec2b0
commit 5bb5070c10

View File

@ -14,28 +14,3 @@ diff -urN tg/Makefile tg-cygwin/Makefile
LINK_FLAGS=${LDFLAGS} ${LOCAL_LDFLAGS}
DEP=dep
diff -urN tg/loop.c tg-cygwin/loop.c
--- tg/loop.c 2015-06-16 12:37:54.054112200 +0900
+++ tg-cygwin/loop.c 2015-06-16 12:48:12.793954000 +0900
@@ -383,8 +383,9 @@
close (auth_file_fd);
}
-void write_secret_chat (tgl_peer_t *_P, void *extra) {
- struct tgl_secret_chat *P = (void *)_P;
+// In Cygwin's Python, _P is marco constant. So change tgl_peer_t *_P -> tgl_peer_t *_Peer
+void write_secret_chat (tgl_peer_t *_Peer, void *extra) {
+ struct tgl_secret_chat *P = (void *)_Peer;
if (tgl_get_peer_type (P->id) != TGL_PEER_ENCR_CHAT) { return; }
if (P->state != sc_ok) { return; }
int *a = extra;
@@ -634,7 +635,8 @@
vlogprintf (E_WARNING, "Accepting incoming connection\n");
unsigned clilen = 0;
struct sockaddr_in cli_addr;
- int fd = accept (efd, (struct sockaddr *)&cli_addr, &clilen);
+ // In Cygwin, put unsigned int in socklen_t produce warning. Add (socklen_t *) casting
+ int fd = accept (efd, (struct sockaddr *)&cli_addr, (socklen_t *)&clilen);
assert (fd >= 0);
struct bufferevent *bev = bufferevent_socket_new (TLS->ev_base, fd, 0);