summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>2011-11-02 10:57:10 (GMT)
committerdominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>2011-11-02 10:57:10 (GMT)
commitce65671b78e140872cb07b2b7155df0b60979086 (patch)
treea96fa9ee41cf6bbc007163dc61b782e010f4c716
parentd06598dc4749f4a476386736339254036096582c (diff)
downloadlibproxy-ce65671b78e140872cb07b2b7155df0b60979086.tar.gz
libproxy-ce65671b78e140872cb07b2b7155df0b60979086.tar.xz
Revert #824: too many local changes were applied.
git-svn-id: https://libproxy.googlecode.com/svn/trunk@825 c587cffe-e639-0410-9787-d7902ae8ed56
-rw-r--r--libproxy/CMakeLists.txt2
-rw-r--r--libproxy/proxy.h11
2 files changed, 4 insertions, 9 deletions
diff --git a/libproxy/CMakeLists.txt b/libproxy/CMakeLists.txt
index 6bfb187..412a1d6 100644
--- a/libproxy/CMakeLists.txt
+++ b/libproxy/CMakeLists.txt
@@ -6,7 +6,7 @@ set_project_version(0 4 7)
if (WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
else(WIN32)
- add_definitions(-D_POSIX_C_SOURCE=200112L)
+ add_definitions(-D_POSIX_C_SOURCE=1)
set(CMAKE_CXX_FLAGS "-fvisibility=hidden ${CMAKE_CXX_FLAGS}")
endif(WIN32)
diff --git a/libproxy/proxy.h b/libproxy/proxy.h
index 9da81fa..fb8275b 100644
--- a/libproxy/proxy.h
+++ b/libproxy/proxy.h
@@ -28,20 +28,16 @@ extern "C"
typedef struct pxProxyFactory_ pxProxyFactory;
/**
- * px_proxy_factory_new:
- *
* Creates a new pxProxyFactory instance. This instance should be kept
* around as long as possible as it contains cached data to increase
* performance. Memory usage should be minimal (cache is small) and the
* cache lifespan is handled automatically.
*
- * @returns: (transfer none): A new pxProxyFactory instance or NULL on error
+ * @return A new pxProxyFactory instance or NULL on error
*/
pxProxyFactory *px_proxy_factory_new(void);
/**
- * px_proxy_factory_get_proxies:
- *
* Get which proxies to use for the specified URL.
*
* A NULL-terminated array of proxy strings is returned.
@@ -89,9 +85,8 @@ pxProxyFactory *px_proxy_factory_new(void);
* RTSP streaming proxy. The expected returned configuration would be:
* - rtsp://[username:password@]proxy:port
*
- * @self: a Pointed to the ProxyFactory structure
- * @url: The URL we are trying to reach
- * Returns: (transfer full): A NULL-terminated array of proxy strings to use
+ * @url The URL we are trying to reach
+ * @return A NULL-terminated array of proxy strings to use
*/
char **px_proxy_factory_get_proxies(pxProxyFactory *self, const char *url);