Changeset 5f8ab6a9 for lib


Ignore:
Timestamp:
2010-06-03T10:41:03Z (9 years ago)
Author:
Sven Moritz Hallberg <pesco@…>
Branches:
master
Children:
814aa52
Parents:
3f81999 (diff), f9928cb (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:

merge in bitlbee 1.2.5

Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/misc.c

    r3f81999 r5f8ab6a9  
    3434#include "nogaim.h"
    3535#include "base64.h"
     36#include "md5.h"
    3637#include <stdio.h>
    3738#include <stdlib.h>
     
    4647#endif
    4748
     49#include "md5.h"
    4850#include "ssl_client.h"
    4951
     
    532534
    533535/* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
    534 char *word_wrap( char *msg, int line_len )
     536char *word_wrap( const char *msg, int line_len )
    535537{
    536538        GString *ret = g_string_sized_new( strlen( msg ) + 16 );
  • lib/misc.h

    r3f81999 r5f8ab6a9  
    6262G_MODULE_EXPORT struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain );
    6363
    64 G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
     64G_MODULE_EXPORT char *word_wrap( const char *msg, int line_len );
    6565
    6666G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
Note: See TracChangeset for help on using the changeset viewer.