Imported Upstream version 2.53.3

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

diff --git a/glib/deprecated/gmain.h b/glib/deprecated/gmain.h
index d1ddf19..d14dd0e 100644 (file)
--- a/glib/deprecated/gmain.h
+++ b/glib/deprecated/gmain.h
@@ -4,7 +4,7 @@
  * 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.
+ * version 2.1 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
@@ -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/>.
  */
 
 /*
@@ -24,17 +22,19 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_DEPRECATED_MAIN_H__
+#define __G_DEPRECATED_MAIN_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_DEPRECATED_MAIN_H__
-#define __G_DEPRECATED_MAIN_H__
-
 #include <glib/gmain.h>
 
 G_BEGIN_DECLS
 
+#ifndef G_DISABLE_DEPRECATED
+
 /* ============== Compat main loop stuff ================== */
 
 /**
@@ -132,6 +132,7 @@ G_BEGIN_DECLS
  */
 #define g_main_set_poll_func(func)  g_main_context_set_poll_func (NULL, func)
 
+#endif
 
 G_END_DECLS