Add a cast to silence compiler warnings. (#321978, Andrew Paprocki)

2005-12-27  Matthias Clasen  <mclasen@redhat.com>

        * glib/gdatasetprivate.h: Add a cast to silence compiler
        warnings.  (#321978, Andrew Paprocki)

diff --git a/ChangeLog b/ChangeLog
index db038ee2d2409a3bd2dd5edff50e4d9a613e9a31..3c1587583081f1796732daf4fcdbef7ee633059b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2005-12-27  Matthias Clasen  <mclasen@redhat.com>
+       
+       * glib/gdatasetprivate.h: Add a cast to silence compiler
+       warnings.  (#321978, Andrew Paprocki)
 
        Partial fix for bug #32937, Bogdan Nicula.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db038ee2d2409a3bd2dd5edff50e4d9a613e9a31..3c1587583081f1796732daf4fcdbef7ee633059b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,7 @@
 2005-12-27  Matthias Clasen  <mclasen@redhat.com>
+       
+       * glib/gdatasetprivate.h: Add a cast to silence compiler
+       warnings.  (#321978, Andrew Paprocki)
 
        Partial fix for bug #32937, Bogdan Nicula.
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index db038ee2d2409a3bd2dd5edff50e4d9a613e9a31..3c1587583081f1796732daf4fcdbef7ee633059b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,4 +1,7 @@
 2005-12-27  Matthias Clasen  <mclasen@redhat.com>
+       
+       * glib/gdatasetprivate.h: Add a cast to silence compiler
+       warnings.  (#321978, Andrew Paprocki)
 
        Partial fix for bug #32937, Bogdan Nicula.
 

diff --git a/glib/gdatasetprivate.h b/glib/gdatasetprivate.h
index 1a0d947ffb3351f1d91f4c9787a84c175a105359..5da9026a9a105d274f14ddbdad004864c4b6f7dc 100644 (file)
--- a/glib/gdatasetprivate.h
+++ b/glib/gdatasetprivate.h
@@ -33,10 +33,10 @@
 G_BEGIN_DECLS
 
 /* GET_FLAGS is implemented via atomic pointer access, to allow memory
- * barriers take effect without acquirering the global dataset mutex.
+ * barriers to take effect without acquiring the global dataset mutex.
  */
 #define G_DATALIST_GET_FLAGS(datalist)                         \
-  ((gsize) g_atomic_pointer_get (datalist) & G_DATALIST_FLAGS_MASK)
+  ((gsize) g_atomic_pointer_get ((gpointer *)(datalist)) & G_DATALIST_FLAGS_MASK)
 
 
 G_END_DECLS