Ticket #873: cplusplus.patch

File cplusplus.patch, 5.5 KB (added by millerdevel@…, at 2011-12-18T22:33:53Z)

bzr merge directive

  • bitlbee.h 

    # Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: millerdevel@gmail.com-20111218204547-11tl8ffutx6pc46f
# target_branch: http://code.bitlbee.org/bitlbee/
# testament_sha1: f41334c39c121fb788bdd108d8dac01413bcfece
# timestamp: 2011-12-18 16:29:40 -0600
# base_revision_id: wilmer@gaast.net-20111213003407-pgu9iteoa9ma78l5
# 
# Begin patch
=== modified file 'bitlbee.h'
     
    2626#ifndef _BITLBEE_H
    2727#define _BITLBEE_H
    2828
     29#ifdef __cplusplus
     30extern "C" {
     31#endif
     32
    2933#ifndef _GNU_SOURCE
    3034#define _GNU_SOURCE /* Stupid GNU :-P */
    3135#endif
    … …  
    174178
    175179extern global_t global;
    176180
    177 #endif
     181#ifdef __cplusplus
     182}
     183#endif
     184
     185#endif
     186

  • irc.h 

    === modified file 'irc.h'
     
    181181        gboolean (*privmsg)( irc_channel_t *ic, const char *msg );
    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       
    187187        gboolean (*_init)( irc_channel_t *ic );
    … …  
    331331void irc_send_msg( irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix );
    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
    339339/* irc_user.c */
    340340irc_user_t *irc_user_new( irc_t *irc, const char *nick );
    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 );
    346346void irc_user_quit( irc_user_t *iu, const char *msg );

  • protocols/bee.h 

    === modified file 'protocols/bee.h'
     
    122122        gboolean (*chat_msg)( bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *msg, time_t sent_at );
    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 );
    128128