diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-07 15:31:07 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-07 15:31:07 +0100 |
| commit | 4aa0f6bc5645e124738ab15ad1eb65d4147dba25 (patch) | |
| tree | 0f15a76a814c33c8759c9d97253423ed12c0e1cc /protocols/yahoo | |
| parent | 0d9d53ed0b3eb068cf57355a4d1465beaf191f8a (diff) | |
| parent | 1fdb0a48438d6dc4a4795d195737890ed3e46a96 (diff) | |
Merging killerbee stuff, bringing all the bleeding-edge stuff together.
Diffstat (limited to 'protocols/yahoo')
| -rw-r--r-- | protocols/yahoo/Makefile | 5 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/protocols/yahoo/Makefile b/protocols/yahoo/Makefile index b4fe56e2..20ecce71 100644 --- a/protocols/yahoo/Makefile +++ b/protocols/yahoo/Makefile @@ -7,6 +7,9 @@ ### DEFINITIONS -include ../../Makefile.settings +ifdef SRCDIR +SRCDIR := $(SRCDIR)protocols/yahoo/ +endif # [SH] Program variables objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o @@ -32,7 +35,7 @@ distclean: clean $(objects): ../../Makefile.settings Makefile -$(objects): %.o: %.c +$(objects): %.o: $(SRCDIR)%.c @echo '*' Compiling $< @$(CC) -c $(CFLAGS) $< -o $@ diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c index 95e1b3be..d9f90fe0 100644 --- a/protocols/yahoo/yahoo.c +++ b/protocols/yahoo/yahoo.c @@ -685,7 +685,7 @@ int ext_yahoo_add_handler( int id, int fd, yahoo_input_condition cond, void *dat d->data = data; inp->d = d; - d->tag = inp->h = b_input_add( fd, GAIM_INPUT_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d ); + d->tag = inp->h = b_input_add( fd, B_EV_IO_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d ); } else if( cond == YAHOO_INPUT_WRITE ) { @@ -696,7 +696,7 @@ int ext_yahoo_add_handler( int id, int fd, yahoo_input_condition cond, void *dat d->data = data; inp->d = d; - d->tag = inp->h = b_input_add( fd, GAIM_INPUT_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d ); + d->tag = inp->h = b_input_add( fd, B_EV_IO_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d ); } else { |