Imported Upstream version 2.53.3

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

diff --git a/glib/gslice.h b/glib/gslice.h
index e1b6686..8076276 100644 (file)
--- a/glib/gslice.h
+++ b/glib/gslice.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/>.
  */
 
 #ifndef __G_SLICE_H__
@@ -62,16 +60,17 @@ void     g_slice_free_chain_with_offset (gsize         block_size,
 #define g_slice_dup(type, mem)                                  \
   (1 ? (type*) g_slice_copy (sizeof (type), (mem))              \
      : ((void) ((type*) 0 == (mem)), (type*) 0))
-#define g_slice_free(type, mem)                                do {    \
+#define g_slice_free(type, mem)                                 \
+G_STMT_START {                                                  \
   if (1) g_slice_free1 (sizeof (type), (mem));                 \
   else   (void) ((type*) 0 == (mem));                          \
-} while (0)
-#define g_slice_free_chain(type, mem_chain, next)      do {    \
+} G_STMT_END
+#define g_slice_free_chain(type, mem_chain, next)               \
+G_STMT_START {                                                  \
   if (1) g_slice_free_chain_with_offset (sizeof (type),                \
                  (mem_chain), G_STRUCT_OFFSET (type, next));   \
   else   (void) ((type*) 0 == (mem_chain));                    \
-} while (0)
-
+} G_STMT_END
 
 /* --- internal debugging API --- */
 typedef enum {