Skip to content

Commit

Permalink
Some systems (BSD,MacOsX,HP-UX,...) define MAP_ANON and not MAP_ANONY…
Browse files Browse the repository at this point in the history
…MOUS. Make each an alias of other to be sure. issue reported by Martin Proetzsch.
  • Loading branch information
Laurent Monin committed Jul 30, 2009
1 parent 50d5899 commit 3591c21
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
8 changes: 8 additions & 0 deletions src/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,13 @@ GList* hash_table_get_keys(GHashTable *hash_table);
#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: */
28 changes: 14 additions & 14 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@
* 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"

Expand All @@ -36,20 +50,6 @@
#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;
Expand Down

0 comments on commit 3591c21

Please sign in to comment.