hook gvariant vectors up to kdbus

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

diff --git a/glib/gslice.h b/glib/gslice.h
index 93b545a..411140f 100644 (file)
--- a/glib/gslice.h
+++ b/glib/gslice.h
@@ -12,15 +12,14 @@
  * 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__
 #define __G_SLICE_H__
 
-#ifndef __G_MEM_H__
-#error Include <glib.h> instead of <gslice.h>
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
 #endif
 
 #include <glib/gtypes.h>
@@ -29,16 +28,26 @@ G_BEGIN_DECLS
 
 /* slices - fast allocation/release of small memory blocks
  */
-gpointer g_slice_alloc                 (gsize    block_size) G_GNUC_MALLOC;
-gpointer g_slice_alloc0                (gsize    block_size) G_GNUC_MALLOC;
-void     g_slice_free1                 (gsize    block_size,
-                                        gpointer mem_block);
-void     g_slice_free_chain_with_offset (gsize    block_size,
-                                        gpointer mem_chain,
-                                        gsize    next_offset);
+GLIB_AVAILABLE_IN_ALL
+gpointer g_slice_alloc                 (gsize         block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_ALL
+gpointer g_slice_alloc0                (gsize         block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_ALL
+gpointer g_slice_copy                   (gsize         block_size,
+                                         gconstpointer mem_block) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+GLIB_AVAILABLE_IN_ALL
+void     g_slice_free1                 (gsize         block_size,
+                                        gpointer      mem_block);
+GLIB_AVAILABLE_IN_ALL
+void     g_slice_free_chain_with_offset (gsize         block_size,
+                                        gpointer      mem_chain,
+                                        gsize         next_offset);
 #define  g_slice_new(type)      ((type*) g_slice_alloc (sizeof (type)))
 #define  g_slice_new0(type)     ((type*) g_slice_alloc0 (sizeof (type)))
-/*       g_slice_free                   (MemoryBlockType,
+/* MemoryBlockType *
+ *       g_slice_dup                    (MemoryBlockType,
+ *                                      MemoryBlockType *mem_block);
+ *       g_slice_free                   (MemoryBlockType,
  *                                      MemoryBlockType *mem_block);
  *       g_slice_free_chain             (MemoryBlockType,
  *                                       MemoryBlockType *first_chain_block,
@@ -48,6 +57,9 @@ void     g_slice_free_chain_with_offset (gsize    block_size,
  */
 
 /* we go through extra hoops to ensure type safety */
+#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 {    \
   if (1) g_slice_free1 (sizeof (type), (mem));                 \
   else   (void) ((type*) 0 == (mem));                          \
@@ -68,10 +80,19 @@ typedef enum {
   G_SLICE_CONFIG_CHUNK_SIZES,
   G_SLICE_CONFIG_CONTENTION_COUNTER
 } GSliceConfig;
+
+GLIB_DEPRECATED_IN_2_34
 void     g_slice_set_config       (GSliceConfig ckey, gint64 value);
+GLIB_DEPRECATED_IN_2_34
 gint64   g_slice_get_config       (GSliceConfig ckey);
+GLIB_DEPRECATED_IN_2_34
 gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
 
+#ifdef G_ENABLE_DEBUG
+GLIB_AVAILABLE_IN_ALL
+void     g_slice_debug_tree_statistics (void);
+#endif
+
 G_END_DECLS
 
 #endif /* __G_SLICE_H__ */