Changeset 6d41bc5


Ignore:
Timestamp:
2010-12-08T02:42:21Z (11 years ago)
Author:
Miklos Vajna <vmiklos@…>
Branches:
master
Children:
87e1eba
Parents:
e8e2892 (diff), 7f41495 (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 branch 'NetBSD-plugin' of git://github.com/pcrama/bitlbee-skype

Location:
skype
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • skype/configure.ac

    re8e2892 r6d41bc5  
    1313
    1414case "`$CC -dumpmachine`" in
    15         *linux*|*freebsd*)
     15        *linux*|*freebsd*|*netbsd*)
    1616                SHARED_FLAGS="-fPIC -shared"
    1717                SHARED_EXT="so"
  • skype/skype.c

    re8e2892 r6d41bc5  
    2424#include <poll.h>
    2525#include <bitlbee.h>
    26 #include <bitlbee/ssl_client.h>
     26#include <ssl_client.h>
    2727
    2828#define SKYPE_DEFAULT_SERVER "localhost"
Note: See TracChangeset for help on using the changeset viewer.