projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a81c9a7
)
Fix mistake in my last commit.
author
Tor Lillqvist
<tml@novell.com>
Mon, 15 Jan 2007 13:41:51 +0000
(13:41 +0000)
committer
Tor Lillqvist
<tml@src.gnome.org>
Mon, 15 Jan 2007 13:41:51 +0000
(13:41 +0000)
2007-01-15 Tor Lillqvist <tml@novell.com>
* glib/gmain.h (struct _GPollFD): Fix mistake in my last commit.
svn path=/trunk/; revision=5271
ChangeLog
patch
|
blob
|
history
glib/gmain.h
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
288f184
..
565939d
100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,7
@@
+2007-01-15 Tor Lillqvist <tml@novell.com>
+
+ * glib/gmain.h (struct _GPollFD): Fix mistake in my last commit.
+
2005-01-15 Matthias Clasen <mclasen@redhat.com>
* glib/giochannel.c:
diff --git
a/glib/gmain.h
b/glib/gmain.h
index
39f9515
..
1d201dd
100644
(file)
--- a/
glib/gmain.h
+++ b/
glib/gmain.h
@@
-120,7
+120,7
@@
typedef gint (*GPollFunc) (GPollFD *ufds,
struct _GPollFD
{
-#if
def G_OS_WIN32
&& GLIB_SIZEOF_VOID_P == 8
+#if
defined (G_OS_WIN32)
&& GLIB_SIZEOF_VOID_P == 8
gint64 fd;
#else
gint fd;