make it possible to disable single-file includes by defining

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

diff --git a/glib/gslice.h b/glib/gslice.h
index dc0cc2e..56dc73f 100644 (file)
--- a/glib/gslice.h
+++ b/glib/gslice.h
@@ -16,6 +16,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #ifndef __G_SLICE_H__
 #define __G_SLICE_H__
 
@@ -29,37 +34,51 @@ 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     (gsize    block_size,
-                                gpointer mem_chain,
-                                gsize    next_offset);
+gpointer g_slice_alloc                 (gsize         block_size) G_GNUC_MALLOC;
+gpointer g_slice_alloc0                (gsize         block_size) G_GNUC_MALLOC;
+gpointer g_slice_copy                   (gsize         block_size,
+                                         gconstpointer mem_block) 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);
 #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(type,mem) g_slice_free1 (sizeof (type), mem) */
+/* MemoryBlockType *
+ *       g_slice_dup                    (MemoryBlockType,
+ *                                      MemoryBlockType *mem_block);
+ *       g_slice_free                   (MemoryBlockType,
+ *                                      MemoryBlockType *mem_block);
+ *       g_slice_free_chain             (MemoryBlockType,
+ *                                       MemoryBlockType *first_chain_block,
+ *                                       memory_block_next_field);
+ * pseudo prototypes for the macro
+ * definitions following below.
+ */
+
+/* we go through extra hoops to ensure type safety */
+#define g_slice_dup(type, mem)                                  \
+  (1 ? g_slice_copy (sizeof (type), (mem)) : (type*) ((type*) 0 == (mem)))
+#define g_slice_free(type, mem)                                do {    \
+  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 {    \
+  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)
 
-#if __GNUC__ >= 2
-/* for GCC, define a type-safe variant of g_slice_free() */
-#define  g_slice_free(type, mem)       ({                      \
-  static inline void g_slice_free (gsize, type*);              \
-  while (0) g_slice_free (sizeof (type), mem);                         \
-  g_slice_free1 (sizeof (type), mem);                          \
-})
-#else
-#define        g_slice_free(type, mem) g_slice_free1 (sizeof (type) + (gsize) (type*) 0, mem)
-/* we go through the extra (gsize)(type*)0 hoop to ensure a known type argument */
-#endif
 
 /* --- internal debugging API --- */
 typedef enum {
   G_SLICE_CONFIG_ALWAYS_MALLOC = 1,
   G_SLICE_CONFIG_BYPASS_MAGAZINES,
-  G_SLICE_CONFIG_ALWAYS_FREE,
   G_SLICE_CONFIG_WORKING_SET_MSECS,
+  G_SLICE_CONFIG_COLOR_INCREMENT,
   G_SLICE_CONFIG_CHUNK_SIZES,
-  G_SLICE_CONFIG_CONTENTION_COUNTER,
+  G_SLICE_CONFIG_CONTENTION_COUNTER
 } GSliceConfig;
 void     g_slice_set_config       (GSliceConfig ckey, gint64 value);
 gint64   g_slice_get_config       (GSliceConfig ckey);