Last change
on this file since 0b9daac was
0b9daac,
checked in by dequis <dx@…>, at 2015-02-20T23:16:08Z
|
Reorganize include files to avoid conflicts with other libs
- Change all header includes to be relative to the project root
- Remove -I${includedir} from bitlbee.pc Cflags
- Install lib and protocols headers to their own directories. So now it is:
/usr/include/bitlbee/*.h
/usr/include/bitlbee/lib/*.h
/usr/include/bitlbee/protocols/*.h
This breaks backwards compatibility of third party plugins, but now
they don't have to do ambiguous includes like #include <proxy.h>
This also fixes trac ticket 1170 - conflicts when libproxy and liboauth
are installed at the same time bitlbee is built, which the macports
project ran into several times.
|
-
Property mode set to
100644
|
File size:
1.5 KB
|
Rev | Line | |
---|
[b7d3cc34] | 1 | /* |
---|
[ecf8fa8] | 2 | * nogaim |
---|
[b7d3cc34] | 3 | * |
---|
| 4 | * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net> |
---|
| 5 | * |
---|
| 6 | * This program is free software; you can redistribute it and/or modify |
---|
| 7 | * it under the terms of the GNU General Public License as published by |
---|
| 8 | * the Free Software Foundation; either version 2 of the License, or |
---|
| 9 | * (at your option) any later version. |
---|
| 10 | * |
---|
| 11 | * This program is distributed in the hope that it will be useful, |
---|
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
| 14 | * GNU General Public License for more details. |
---|
| 15 | * |
---|
| 16 | * You should have received a copy of the GNU General Public License |
---|
| 17 | * along with this program; if not, write to the Free Software |
---|
[6f10697] | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
---|
[b7d3cc34] | 19 | * |
---|
| 20 | */ |
---|
| 21 | |
---|
| 22 | /* this is the export part of the proxy.c file. it does a little |
---|
| 23 | prototype-ing stuff and redefine some net function to mask them |
---|
[5ebff60] | 24 | with some kind of transparent layer */ |
---|
[b7d3cc34] | 25 | |
---|
| 26 | #ifndef _PROXY_H_ |
---|
| 27 | #define _PROXY_H_ |
---|
| 28 | |
---|
| 29 | #include <sys/types.h> |
---|
| 30 | #include <sys/socket.h> |
---|
| 31 | #include <netdb.h> |
---|
| 32 | #include <netinet/in.h> |
---|
| 33 | #include <glib.h> |
---|
| 34 | #include <gmodule.h> |
---|
| 35 | |
---|
[0b9daac] | 36 | #include "lib/events.h" |
---|
[ecf8fa8] | 37 | |
---|
[b7d3cc34] | 38 | #define PROXY_NONE 0 |
---|
| 39 | #define PROXY_HTTP 1 |
---|
| 40 | #define PROXY_SOCKS4 2 |
---|
| 41 | #define PROXY_SOCKS5 3 |
---|
| 42 | |
---|
| 43 | extern char proxyhost[128]; |
---|
[5ebff60] | 44 | extern int proxyport; |
---|
| 45 | extern int proxytype; |
---|
[b7d3cc34] | 46 | extern char proxyuser[128]; |
---|
| 47 | extern char proxypass[128]; |
---|
| 48 | |
---|
[ba9edaa] | 49 | G_MODULE_EXPORT int proxy_connect(const char *host, int port, b_event_handler func, gpointer data); |
---|
[b7d3cc34] | 50 | |
---|
| 51 | #endif /* _PROXY_H_ */ |
---|
Note: See
TracBrowser
for help on using the repository browser.