Revision: 1811
http://geeqie.svn.sourceforge.net/geeqie/?rev=1811&view=rev
Author: zas_
Date: 2009-07-30 17:59:20 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
Some systems (BSD,MacOsX,HP-UX,...) define MAP_ANON and not MAP_ANONYMOUS. Make
each an alias of other to be sure. issue reported by Martin Proetzsch.
Modified Paths:
--------------
trunk/src/compat.h
trunk/src/main.c
Modified: trunk/src/compat.h
===================================================================
--- trunk/src/compat.h 2009-07-29 21:03:38 UTC (rev 1810)
+++ trunk/src/compat.h 2009-07-30 17:59:20 UTC (rev 1811)
@@ -21,5 +21,13 @@
#endif
+/* Some systems (BSD,MacOsX,HP-UX,...) define MAP_ANON and not MAP_ANONYMOUS */
+#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#elif defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
+#define MAP_ANON MAP_ANONYMOUS
+#endif
+
+
#endif /* COMPAT_H */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-07-29 21:03:38 UTC (rev 1810)
+++ trunk/src/main.c 2009-07-30 17:59:20 UTC (rev 1811)
@@ -10,7 +10,21 @@
* This software comes with no warranty of any kind, use at your own risk!
*/
+#include <gdk/gdkkeysyms.h> /* for keyboard values */
+#ifdef HAVE_LIBCHAMPLAIN
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+#include <clutter-gtk/gtk-clutter-embed.h>
+#endif
+#endif
+#include <signal.h>
+#include <sys/mman.h>
+
+#include <math.h>
+#ifdef G_OS_UNIX
+#include <pwd.h>
+#endif
+
#include "main.h"
#include "cache.h"
@@ -36,21 +50,7 @@
#include "histogram.h"
#include "pixbuf_util.h"
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-#ifdef HAVE_LIBCHAMPLAIN
-#ifdef HAVE_LIBCHAMPLAIN_GTK
-#include <clutter-gtk/gtk-clutter-embed.h>
-#endif
-#endif
-#include <signal.h>
-#include <sys/mman.h>
-
-#include <math.h>
-#ifdef G_OS_UNIX
-#include <pwd.h>
-#endif
-
gboolean thumb_format_changed = FALSE;
static RemoteConnection *remote_connection = NULL;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
