X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgnetworkingprivate.h;h=b28ff4417e2a07a60bbe46374d89c06728f3d8e7;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=2be3688637532f66d40ec4ce1099d68eeb648873;hpb=666374c16f3d8118fe3422839d22ca32af69e4d0;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gnetworkingprivate.h b/gio/gnetworkingprivate.h
index 2be3688..b28ff44 100644
--- a/gio/gnetworkingprivate.h
+++ b/gio/gnetworkingprivate.h
@@ -13,106 +13,16 @@
* 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 .
*/
#ifndef __G_NETWORKINGPRIVATE_H__
#define __G_NETWORKINGPRIVATE_H__
-#ifdef G_OS_WIN32
-
-#define _WIN32_WINNT 0x0501
-#include
-#undef interface
-#include
-#include
-#include
-
-#ifdef HAVE_WSPIAPI_H
-/* in the Windows SDK and in mingw-w64 has wrappers for
- * inline workarounds for getaddrinfo, getnameinfo and freeaddrinfo if
- * they aren't present at run-time (on Windows 2000).
- */
-#include
-#endif
-
-#else /* !G_OS_WIN32 */
-
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#if defined(HAVE_ARPA_NAMESER_COMPAT_H) && !defined(GETSHORT)
-#include
-#endif
-#include
-
-#ifndef T_SRV
-#define T_SRV 33
-#endif
-
-#ifndef _PATH_RESCONF
-#define _PATH_RESCONF "/etc/resolv.conf"
-#endif
-
-#ifndef CMSG_LEN
-/* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on
- * some older platforms.
- */
-#define CMSG_LEN(len) ((size_t)CMSG_DATA((struct cmsghdr *)NULL) + (len))
-
-/* CMSG_SPACE must add at least as much padding as CMSG_NXTHDR()
- * adds. We overestimate here.
- */
-#define ALIGN_TO_SIZEOF(len, obj) (((len) + sizeof (obj) - 1) & ~(sizeof (obj) - 1))
-#define CMSG_SPACE(len) ALIGN_TO_SIZEOF (CMSG_LEN (len), struct cmsghdr)
-#endif
-#endif
+#include "gnetworking.h"
G_BEGIN_DECLS
-extern struct addrinfo _g_resolver_addrinfo_hints;
-
-GList *_g_resolver_addresses_from_addrinfo (const char *hostname,
- struct addrinfo *res,
- gint gai_retval,
- GError **error);
-
-void _g_resolver_address_to_sockaddr (GInetAddress *address,
- struct sockaddr_storage *sa,
- gsize *len);
-char *_g_resolver_name_from_nameinfo (GInetAddress *address,
- const gchar *name,
- gint gni_retval,
- GError **error);
-
-#if defined(G_OS_UNIX)
-gint _g_resolver_record_type_to_rrtype (GResolverRecordType record_type);
-
-GList *_g_resolver_records_from_res_query (const gchar *rrname,
- gint rrtype,
- guchar *answer,
- gint len,
- gint herr,
- GError **error);
-#elif defined(G_OS_WIN32)
-WORD _g_resolver_record_type_to_dnstype (GResolverRecordType record_type);
-
-GList *_g_resolver_records_from_DnsQuery (const gchar *rrname,
- WORD dnstype,
- DNS_STATUS status,
- DNS_RECORD *results,
- GError **error);
-#endif
-
gboolean _g_uri_parse_authority (const char *uri,
char **host,
guint16 *port,
@@ -122,6 +32,13 @@ gchar * _g_uri_from_authority (const gchar *protocol,
guint port,
const gchar *userinfo);
+guint64 g_resolver_get_serial (GResolver *resolver);
+
+gint g_socket (gint domain,
+ gint type,
+ gint protocol,
+ GError **error);
+
G_END_DECLS
#endif /* __G_NETWORKINGPRIVATE_H__ */