projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix printf-tests on W32 by ifdefing the expected output
[platform/upstream/glib.git]
/
glib
/
gdatasetprivate.h
diff --git
a/glib/gdatasetprivate.h
b/glib/gdatasetprivate.h
index
9397c60
..
4f98040
100644
(file)
--- a/
glib/gdatasetprivate.h
+++ b/
glib/gdatasetprivate.h
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* 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/>.
*/
/*
*/
/*
@@
-28,7
+26,7
@@
#ifndef __G_DATASETPRIVATE_H__
#define __G_DATASETPRIVATE_H__
#ifndef __G_DATASETPRIVATE_H__
#define __G_DATASETPRIVATE_H__
-#include <g
lib/gdataset
.h>
+#include <g
atomic
.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-36,7
+34,7
@@
G_BEGIN_DECLS
* barriers to take effect without acquiring the global dataset mutex.
*/
#define G_DATALIST_GET_FLAGS(datalist) \
* barriers to take effect without acquiring the global dataset mutex.
*/
#define G_DATALIST_GET_FLAGS(datalist) \
- ((gsize) g_atomic_pointer_get (
(gpointer*)
datalist) & G_DATALIST_FLAGS_MASK)
+ ((gsize) g_atomic_pointer_get (datalist) & G_DATALIST_FLAGS_MASK)
G_END_DECLS
G_END_DECLS