Fix build with latest glib2. Based on patches from David Shao in PR 46392.


(dholland)

$NetBSD: patch-src_channel_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/channel.c~	2005-12-08 22:04:46.000000000 +0000
+++ src/channel.c
@@ -19,8 +19,6 @@
 */
 
 #include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
 #include <string.h>
 
 #include "mw_channel.h"

$NetBSD: patch-src_mw__debug_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/mw_debug.c~	2005-12-03 03:46:10.000000000 +0000
+++ src/mw_debug.c
@@ -19,7 +19,7 @@
 */
 
 
-#include <glib/gstring.h>
+#include <glib.h>
 
 #include "mw_debug.h"
 

$NetBSD: patch-src_mw__message_h,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/mw_message.h~	2005-12-15 00:30:28.000000000 +0000
+++ src/mw_message.h
@@ -22,7 +22,7 @@
 #define _MW_MESSAGE_H
 
 
-#include <glib/glist.h>
+#include <glib.h>
 #include "mw_common.h"
 
 

$NetBSD: patch-src_mw__srvc__conf_h,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/mw_srvc_conf.h~	2005-12-15 00:30:28.000000000 +0000
+++ src/mw_srvc_conf.h
@@ -22,7 +22,7 @@
 #define _MW_SRVC_CONF_H
 
 
-#include <glib/glist.h>
+#include <glib.h>
 #include "mw_common.h"
 
 

$NetBSD: patch-src_mw__srvc__dir_h,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/mw_srvc_dir.h~	2005-12-15 00:30:28.000000000 +0000
+++ src/mw_srvc_dir.h
@@ -22,7 +22,6 @@
 
 
 #include <glib.h>
-#include <glib/glist.h>
 
 
 #ifdef __cplusplus

$NetBSD: patch-src_mw__srvc__place_h,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/mw_srvc_place.h~	2005-12-15 00:30:28.000000000 +0000
+++ src/mw_srvc_place.h
@@ -22,7 +22,7 @@
 #define _MW_SRVC_PLACE_H
 
 
-#include <glib/glist.h>
+#include <glib.h>
 #include "mw_common.h"
 
 

$NetBSD: patch-src_mw__srvc__resolve_h,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/mw_srvc_resolve.h~	2005-12-15 00:30:28.000000000 +0000
+++ src/mw_srvc_resolve.h
@@ -23,7 +23,6 @@
 
 
 #include <glib.h>
-#include <glib/glist.h>
 
 
 #ifdef __cplusplus

$NetBSD: patch-src_mw__st__list_h,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/mw_st_list.h~	2005-12-15 00:30:28.000000000 +0000
+++ src/mw_st_list.h
@@ -30,7 +30,6 @@
 
 
 #include <glib.h>
-#include <glib/glist.h>
 #include "mw_common.h"
 
 

$NetBSD: patch-src_mw__util_h,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/mw_util.h~	2004-12-28 20:41:26.000000000 +0000
+++ src/mw_util.h
@@ -23,8 +23,6 @@
 
 
 #include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
 
 
 #define map_guint_new() \

$NetBSD: patch-src_srvc__aware_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/srvc_aware.c~	2005-12-08 22:02:11.000000000 +0000
+++ src/srvc_aware.c
@@ -19,8 +19,6 @@
 */
 
 #include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
 #include <string.h>
 
 #include "mw_channel.h"

$NetBSD: patch-src_srvc__conf_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/srvc_conf.c~	2005-12-28 02:46:54.000000000 +0000
+++ src/srvc_conf.c
@@ -19,8 +19,6 @@
 */
 
 #include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
 
 #include <stdio.h>
 #include <stdlib.h>

$NetBSD: patch-src_srvc__dir_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/srvc_dir.c~	2005-09-15 20:30:20.000000000 +0000
+++ src/srvc_dir.c
@@ -18,7 +18,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "mw_channel.h"
 #include "mw_common.h"

$NetBSD: patch-src_srvc__ft_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/srvc_ft.c~	2005-09-15 20:30:37.000000000 +0000
+++ src/srvc_ft.c
@@ -19,7 +19,7 @@
 */
 
 
-#include <glib/glist.h>
+#include <glib.h>
 
 #include "mw_channel.h"
 #include "mw_common.h"

$NetBSD: patch-src_srvc__im_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/srvc_im.c~	2005-12-28 02:46:54.000000000 +0000
+++ src/srvc_im.c
@@ -19,7 +19,6 @@
 */
 
 #include <glib.h>
-#include <glib/glist.h>
 #include <string.h>
 
 #include "mw_channel.h"

$NetBSD: patch-src_srvc__place_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/srvc_place.c~	2005-12-03 02:00:29.000000000 +0000
+++ src/srvc_place.c
@@ -19,8 +19,6 @@
 */
 
 #include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
 
 #include <stdio.h>
 #include <stdlib.h>

$NetBSD: patch-src_srvc__resolve_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/srvc_resolve.c~	2005-10-27 00:10:06.000000000 +0000
+++ src/srvc_resolve.c
@@ -18,7 +18,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "mw_channel.h"
 #include "mw_common.h"

$NetBSD: patch-src_srvc__store_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/srvc_store.c~	2005-11-19 01:52:42.000000000 +0000
+++ src/srvc_store.c
@@ -18,7 +18,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <glib/glist.h>
+#include <glib.h>
 
 #include "mw_channel.h"
 #include "mw_debug.h"

$NetBSD: patch-src_st__list_c,v 1.1 2012/05/06 17:53:44 dholland Exp $

Fix build with latest glib2.

--- src/st_list.c~	2005-12-08 22:01:27.000000000 +0000
+++ src/st_list.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <glib/gstring.h>
+#include <glib.h>
 
 #include "mw_debug.h"
 #include "mw_util.h"