Changeset 25c4c78 for protocols

Timestamp:

2015-01-16T19:50:24Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

a6cd799

Parents:

7549d00

git-author:

Jason Copenhaver <jcopenha@…> (16-01-15 19:50:24)

git-committer:

dequis <dx@…> (16-01-15 19:50:24)

Message:

Fix compiler warnings on Cygwin and Mac OS X.

• Don't use PIE/PIC on Cygwin/Darwin unless specified as these platforms don't support it.
• Cleanup warnings for 'make check' build.
• Fix the type issue for getsockopt calls.
• Fix enum warnings in Yahoo libs on Mac OS X.

Location:

protocols

Files:

• oscar/conn.c (modified) (1 diff)
• yahoo/libyahoo2.c (modified) (5 diffs)
• yahoo/yahoo_util.h (modified) (1 diff)

protocols/oscar/conn.c

@@ -571 +571 @@
 
         if (FD_ISSET(conn->fd, &fds) || FD_ISSET(conn->fd, &wfds)) {
-                unsigned int len = sizeof(error);
+                socklen_t len = sizeof(error);
 
                 if (getsockopt(conn->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0)

protocols/yahoo/libyahoo2.c

@@ -974 +974 @@
                         msg = pair->value;
 
-                if (pair->key == 13) ;
+                if (pair->key == 13) 
+                        ;
                 if (pair->key == 16)    /* error */
                         msg = pair->value;
@@ -1795 +1796 @@
         switch (code)
         {
-                case 1212: return YAHOO_LOGIN_PASSWD;
-                case 1213: return YAHOO_LOGIN_LOCK;
-                case 1235: return YAHOO_LOGIN_UNAME;
+                case 1212: return (enum yahoo_status) YAHOO_LOGIN_PASSWD;
+                case 1213: return (enum yahoo_status) YAHOO_LOGIN_LOCK;
+                case 1235: return (enum yahoo_status) YAHOO_LOGIN_UNAME;
                 default: return (enum yahoo_status) code;
         }
@@ -3610 +3611 @@
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE,
+        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, (enum ypacket_status) YAHOO_STATUS_OFFLINE,
                 yd->session_id);
 
@@ -3677 +3678 @@
         if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
                 pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
-                        YAHOO_STATUS_AVAILABLE, 0);
+                        (enum ypacket_status) YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "2");
                 yahoo_send_packet(yid, pkt, 0);
@@ -3696 +3697 @@
         if (old_status == YAHOO_STATUS_INVISIBLE) {
                 pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
-                        YAHOO_STATUS_AVAILABLE, 0);
+                        (enum ypacket_status) YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "1");
                 yahoo_send_packet(yid, pkt, 0);

protocols/yahoo/yahoo_util.h

@@ -48 +48 @@
 
 # define snprintf       g_snprintf
+#ifdef vsnprintf
+#undef vsnprintf
+#endif
 # define vsnprintf      g_vsnprintf