Changeset 9034ba0 for protocols/yahoo/yahoo2.h

Timestamp:

2010-07-24T10:57:08Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

78e2eb7

Parents:

c36f73b

Message:

Merge complete. It still logs in...

File:

• protocols/yahoo/yahoo2.h (modified) (3 diffs)

protocols/yahoo/yahoo2.h

@@ -51 +51 @@
 #include "yahoo2_types.h"
 
-/* returns the socket descriptor for a given pager connection. shouldn't be needed */
-int  yahoo_get_fd(int id);
+/* returns the socket descriptor object for a given pager connection. shouldn't be needed */
+        void *yahoo_get_fd(int id);
 
 /* says how much logging to do */
 /* see yahoo2_types.h for the different values */
-int  yahoo_set_log_level(enum yahoo_log_level level);
-enum yahoo_log_level  yahoo_get_log_level( void );
+        int yahoo_set_log_level(enum yahoo_log_level level);
+        enum yahoo_log_level yahoo_get_log_level(void);
 
 /* these functions should be self explanatory */
@@ -222 +222 @@
 /* registered by ext_yahoo_add_handler */
 /* if these return negative values, errno may be set */
-int  yahoo_read_ready(int id, int fd, void *data);
-int  yahoo_write_ready(int id, int fd, void *data);
+        int yahoo_read_ready(int id, void *fd, void *data);
+        int yahoo_write_ready(int id, void *fd, void *data);
 
 /* utility functions. these do not hit the server */
@@ -240 +240 @@
         void yahoo_buddyicon_request(int id, const char *who);
 
-        void yahoo_accept_buddy_ymsg13(int,const char*, const char*);
-        void yahoo_reject_buddy_ymsg13(int,const char*, const char*, const char*);
-
 #include "yahoo_httplib.h"