X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Furl.h;h=5af7dbcafec3531fd0ca73d57d8926e41f103c91;hb=1e5ae8a779b693d8023ce9821b839f29e210d9e8;hp=d2689be536d8bd4b272bded3b756d1e2b93a0333;hpb=332dec49a16b44389e66f3cbc7e0f08f98657ad8;p=libucw.git

diff --git a/ucw/url.h b/ucw/url.h
index d2689be5..5af7dbca 100644
--- a/ucw/url.h
+++ b/ucw/url.h
@@ -11,6 +11,22 @@
 #ifndef _UCW_URL_H
 #define _UCW_URL_H
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define url_auto_canonicalize_rel ucw_url_auto_canonicalize_rel
+#define url_canon_split_rel ucw_url_canon_split_rel
+#define url_canonicalize ucw_url_canonicalize
+#define url_deescape ucw_url_deescape
+#define url_enescape ucw_url_enescape
+#define url_enescape_friendly ucw_url_enescape_friendly
+#define url_error ucw_url_error
+#define url_has_repeated_component ucw_url_has_repeated_component
+#define url_identify_protocol ucw_url_identify_protocol
+#define url_normalize ucw_url_normalize
+#define url_pack ucw_url_pack
+#define url_proto_names ucw_url_proto_names
+#define url_split ucw_url_split
+#endif
+
 #define MAX_URL_SIZE 1024
 
 /* Non-control meanings of control characters */
@@ -44,11 +60,11 @@ int url_enescape_friendly(const char *src, char *dest);
 
 struct url {
   char *protocol;
-  uns protoid;
+  uint protoid;
   char *user;
   char *pass;
   char *host;
-  uns port;				/* ~0 if unspec */
+  uint port;				/* ~0 if unspec */
   char *rest;
   char *buf, *bufend;
 };
@@ -59,7 +75,7 @@ int url_canonicalize(struct url *u);
 int url_pack(struct url *u, char *d);
 int url_canon_split_rel(const char *url, char *buf1, char *buf2, struct url *u, struct url *base);
 int url_auto_canonicalize_rel(const char *src, char *dst, struct url *base);
-uns url_identify_protocol(const char *p);
+uint url_identify_protocol(const char *p);
 int url_has_repeated_component(const char *url);
 
 static inline int url_canon_split(const char *url, char *buf1, char *buf2, struct url *u)
@@ -70,7 +86,7 @@ static inline int url_auto_canonicalize(const char *src, char *dst)
 
 /* Error codes */
 
-char *url_error(uns);
+char *url_error(uint);
 
 #define URL_ERR_TOO_LONG 1
 #define URL_ERR_INVALID_CHAR 2