Changeset a0a3de6


Ignore:
Timestamp:
2011-12-19T10:57:07Z (7 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5a48afd
Parents:
17f057d (diff), c1a58cc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

C++ compatibility fix. Fixes #873.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • bitlbee.h

    r17f057d ra0a3de6  
    2626#ifndef _BITLBEE_H
    2727#define _BITLBEE_H
     28
     29#ifdef __cplusplus
     30extern "C" {
     31#endif
    2832
    2933#ifndef _GNU_SOURCE
     
    175179extern global_t global;
    176180
     181#ifdef __cplusplus
     182}
    177183#endif
     184
     185#endif
     186
  • irc.h

    r17f057d ra0a3de6  
    182182        gboolean (*join)( irc_channel_t *ic );
    183183        gboolean (*part)( irc_channel_t *ic, const char *msg );
    184         gboolean (*topic)( irc_channel_t *ic, const char *new );
     184        gboolean (*topic)( irc_channel_t *ic, const char *new_topic );
    185185        gboolean (*invite)( irc_channel_t *ic, irc_user_t *iu );
    186186       
     
    332332void irc_send_msg_raw( irc_user_t *iu, const char *type, const char *dst, const char *msg );
    333333void irc_send_msg_f( irc_user_t *iu, const char *type, const char *dst, const char *format, ... ) G_GNUC_PRINTF( 4, 5 );
    334 void irc_send_nick( irc_user_t *iu, const char *new );
     334void irc_send_nick( irc_user_t *iu, const char *new_nick );
    335335void irc_send_channel_user_mode_diff( irc_channel_t *ic, irc_user_t *iu,
    336                                       irc_channel_user_flags_t old, irc_channel_user_flags_t new );
     336                                      irc_channel_user_flags_t old_flags, irc_channel_user_flags_t new_flags );
    337337void irc_send_invite( irc_user_t *iu, irc_channel_t *ic );
    338338
     
    341341int irc_user_free( irc_t *irc, irc_user_t *iu );
    342342irc_user_t *irc_user_by_name( irc_t *irc, const char *nick );
    343 int irc_user_set_nick( irc_user_t *iu, const char *new );
     343int irc_user_set_nick( irc_user_t *iu, const char *new_nick );
    344344gint irc_user_cmp( gconstpointer a_, gconstpointer b_ );
    345345const char *irc_user_get_away( irc_user_t *iu );
  • protocols/bee.h

    r17f057d ra0a3de6  
    123123        gboolean (*chat_add_user)( bee_t *bee, struct groupchat *c, bee_user_t *bu );
    124124        gboolean (*chat_remove_user)( bee_t *bee, struct groupchat *c, bee_user_t *bu );
    125         gboolean (*chat_topic)( bee_t *bee, struct groupchat *c, const char *new, bee_user_t *bu );
     125        gboolean (*chat_topic)( bee_t *bee, struct groupchat *c, const char *new_topic, bee_user_t *bu );
    126126        gboolean (*chat_name_hint)( bee_t *bee, struct groupchat *c, const char *name );
    127127        gboolean (*chat_invite)( bee_t *bee, bee_user_t *bu, const char *name, const char *msg );
Note: See TracChangeset for help on using the changeset viewer.