summaryrefslogtreecommitdiff
path: root/gtk/gtkaccelmap.c
diff options
context:
space:
mode:
authorHans Breuer <hans@breuer.org>2001-11-18 15:37:13 +0000
committerHans Breuer <hans@src.gnome.org>2001-11-18 15:37:13 +0000
commitd9eb9ba9d6b1967c8243aecbd043cebe52198819 (patch)
tree9c1d2439f9cdc7867831afef13162db5282cbcbe /gtk/gtkaccelmap.c
parentcdc4f6a476940f20d5989c61016a15e13995bd15 (diff)
downloadgtk+-d9eb9ba9d6b1967c8243aecbd043cebe52198819.tar.gz
make it compile with msvc: !HAVE_UNISTD_H; no label without op, even if
2001-11-18 Hans Breuer <hans@breuer.org> * gtk/gdkaccelmap.c : make it compile with msvc: !HAVE_UNISTD_H; no label without op, even if it's a no-op. * gtk/gtk.def : * gtk/makefile.msc.in : reflect marshaler split, some clean-up * config.h.win32.in : remove definition of HAVE_DIRENT_H * gtk/gtkfilesel.c : due to GDir (new in glib) DIR isn't required anymore, replace it. * gtk/queryimmodules.c : DIR -> GDir replacement, also getcwd() -> g_get_current_dir() * gdk/win32/gdkgeometry-win32.c : adapt to refactored gdkgeometry-x11.c Even 'noisy laugh' scolling appears to work, though I still can't claim to have fully understood what it is supposed to do ...
Diffstat (limited to 'gtk/gtkaccelmap.c')
-rw-r--r--gtk/gtkaccelmap.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index 24dca7d5c3..d99e01aacb 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -16,13 +16,21 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#include "config.h"
+
#include "gtkaccelmap.h"
#include "gtkwindow.h" /* in lack of GtkAcceleratable */
#include <string.h>
#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
#include <errno.h>
@@ -816,6 +824,7 @@ gtk_accel_map_foreach (gpointer data,
goto skip_accel;
foreach_func (data, entry->accel_path, entry->accel_key, entry->accel_mods, changed);
skip_accel:
+ /* noop */;
}
g_slist_free (entries);
}