[kdbus] Make SipHash function as a private utility function to kdbus

[platform/upstream/glib.git] / glib / glib.h

diff --git a/glib/glib.h b/glib/glib.h
index 06056a3..c7fc999 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -12,9 +12,7 @@
  * 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -95,16 +93,19 @@
 #include <glib/gvarianttype.h>
 #include <glib/gvariant.h>
 #include <glib/gversion.h>
+#include <glib/gversionmacros.h>
 #ifdef G_PLATFORM_WIN32
 #include <glib/gwin32.h>
 #endif
 
+#ifndef G_DISABLE_DEPRECATED
 #include <glib/deprecated/gallocator.h>
 #include <glib/deprecated/gcache.h>
 #include <glib/deprecated/gcompletion.h>
 #include <glib/deprecated/gmain.h>
 #include <glib/deprecated/grel.h>
 #include <glib/deprecated/gthread.h>
+#endif /* G_DISABLE_DEPRECATED */
 
 #undef __GLIB_H_INSIDE__