Gary: Symbol renames

[libucw.git] / ucw / url.h

diff --git a/ucw/url.h b/ucw/url.h
index c389fb16a9a9b72b8acc0e16a34307b6c7a4a04e..6a396f189c5046e74b6fed820b36fd7463a8a8e0 100644 (file)
--- 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 */
@@ -24,23 +40,15 @@ enum {
   NCC_EQUAL = 6,
   NCC_AND = 7,
   NCC_HASH = 8,
-#ifdef CONFIG_URL_ESCAPE_COMPAT
-  NCC_MAX = 9
-#else
   // Avoid 9 (\t) and 10 (\n)
   NCC_DOLLAR = 11,
   NCC_PLUS = 12,
   // Avoid 13 (\r)
   NCC_COMMA = 14,
   NCC_MAX = 15
-#endif
 };
 
-#ifdef CONFIG_URL_ESCAPE_COMPAT
-#define NCC_CHARS " ;/?:@=&#"
-#else
 #define NCC_CHARS " ;/?:@=&#\t\n$+\r,"
-#endif
 
 /* Remove/Introduce '%' escapes */