X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgurifuncs.h;h=e36ac0deb2f03ecf1213f16b006a8d4093aff869;hb=49b59e5ac4428a6a99a85d699c3662f96efc4e9d;hp=bbc8f8800a88e3b68eb6b8343903d24b270d93bb;hpb=45a1c41e8cfdeb4edeb7a671b95e599a49c6c281;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h
index bbc8f88..e36ac0d 100644
--- a/glib/gurifuncs.h
+++ b/glib/gurifuncs.h
@@ -13,20 +13,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
 #ifndef __G_URI_FUNCS_H__
 #define __G_URI_FUNCS_H__
 
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
@@ -39,7 +37,7 @@ G_BEGIN_DECLS
 #define G_URI_RESERVED_CHARS_GENERIC_DELIMITERS ":/?#[]@"
 
 /**
- * G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS
+ * G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS:
  * 
  * Subcomponent delimiter characters as defined in RFC 3986. Includes "!$&'()*+,;=".
  **/
@@ -66,12 +64,16 @@ G_BEGIN_DECLS
  **/
 #define G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":"
 
+GLIB_AVAILABLE_IN_ALL
 char *   g_uri_unescape_string       (const char *escaped_string,
 				      const char *illegal_characters);
+GLIB_AVAILABLE_IN_ALL
 char *   g_uri_unescape_segment      (const char *escaped_string,
 				      const char *escaped_string_end,
 				      const char *illegal_characters);
+GLIB_AVAILABLE_IN_ALL
 char *   g_uri_parse_scheme          (const char *uri);
+GLIB_AVAILABLE_IN_ALL
 char *   g_uri_escape_string         (const char *unescaped,
 				      const char *reserved_chars_allowed,
 				      gboolean    allow_utf8);