Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 41 insertions, 0 deletions

diff --git a/lib/win32/glib-2.20.4/glib/glib-object.h b/lib/win32/glib-2.20.4/glib/glib-object.h
new file mode 100644
index 0000000000..8687ef1f2e
--- /dev/null
+++ b/lib/win32/glib-2.20.4/glib/glib-object.h
@@ -0,0 +1,41 @@
+/* GObject - GLib Type, Object, Parameter and Signal Library
+ * Copyright (C) 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * 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.
+ */
+#ifndef __GLIB_GOBJECT_H__
+#define __GLIB_GOBJECT_H__
+
+#define __GLIB_GOBJECT_H_INSIDE__
+
+/* topmost include file for GObject header files */
+#include	<gobject/gboxed.h>
+#include	<gobject/genums.h>
+#include	<gobject/gobject.h>
+#include	<gobject/gparam.h>
+#include	<gobject/gparamspecs.h>
+#include	<gobject/gsignal.h>
+#include	<gobject/gsourceclosure.h>
+#include	<gobject/gtype.h>
+#include	<gobject/gtypemodule.h>
+#include	<gobject/gtypeplugin.h>
+#include	<gobject/gvalue.h>
+#include	<gobject/gvaluearray.h>
+#include	<gobject/gvaluetypes.h>
+
+#undef __GLIB_GOBJECT_H_INSIDE__
+
+#endif /* __GLIB_GOBJECT_H__ */