[gtk-mac-integration] Use __LP64__ instead of __x86_64__ to detect 64-bit builds.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-mac-integration] Use __LP64__ instead of __x86_64__ to detect 64-bit builds.
- Date: Thu, 13 Aug 2020 19:49:22 +0000 (UTC)
commit 61ee79fe15b6cef79cb5227dbb863a50b4034fc1
Author: John Ralls <jralls ceridwen us>
Date: Thu Aug 13 12:48:51 2020 -0700
Use __LP64__ instead of __x86_64__ to detect 64-bit builds.
Because arm64 isn't __x86_64__.
src/gtk-mac-bundle.c | 4 ++--
src/gtk-mac-bundle.h | 4 ++--
src/gtk-mac-dock.c | 4 ++--
src/gtk-mac-dock.h | 4 ++--
src/gtk-mac-menu.c | 4 ++--
src/gtk-mac-menu.h | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/gtk-mac-bundle.c b/src/gtk-mac-bundle.c
index 9fd77a5..5603f4b 100644
--- a/src/gtk-mac-bundle.c
+++ b/src/gtk-mac-bundle.c
@@ -22,7 +22,7 @@
* -psn_... arguments?
*/
-#ifndef __x86_64__
+#ifndef __LP64__
#include <gtk/gtk.h>
#include <Carbon/Carbon.h>
@@ -378,4 +378,4 @@ gtk_mac_bundle_get_resource_path (GtkMacBundle *bundle,
return path;
}
-#endif //__x86_64__
+#endif //__LP64__
diff --git a/src/gtk-mac-bundle.h b/src/gtk-mac-bundle.h
index 8bcdb79..58c3269 100644
--- a/src/gtk-mac-bundle.h
+++ b/src/gtk-mac-bundle.h
@@ -21,7 +21,7 @@
#ifndef __GTK_MAC_BUNDLE_H__
#define __GTK_MAC_BUNDLE_H__
-#ifndef __x86_64__
+#ifndef __LP64__
#include <glib-object.h>
G_BEGIN_DECLS
@@ -60,5 +60,5 @@ gchar * gtk_mac_bundle_get_resource_path (GtkMacBundle *bundle,
G_END_DECLS
-#endif /* __x86_64__*/
+#endif /* __LP64__*/
#endif /* __GTK_MAC_BUNDLE_H__ */
diff --git a/src/gtk-mac-dock.c b/src/gtk-mac-dock.c
index 529030a..351f9cf 100644
--- a/src/gtk-mac-dock.c
+++ b/src/gtk-mac-dock.c
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef __x86_64__
+#ifndef __LP64__
/* FIXME: Add example like this to docs for the open documents stuff:
<key>CFBundleDocumentTypes</key>
@@ -477,4 +477,4 @@ gtk_mac_attention_type_get_type (void)
return 0;
}
-#endif // __x86_64__
+#endif // __LP64__
diff --git a/src/gtk-mac-dock.h b/src/gtk-mac-dock.h
index ef5acd4..26c87d5 100644
--- a/src/gtk-mac-dock.h
+++ b/src/gtk-mac-dock.h
@@ -23,7 +23,7 @@
#ifndef __GTK_MAC_DOCK_H__
#define __GTK_MAC_DOCK_H__
-#ifndef __x86_64__
+#ifndef __LP64__
#include <gtk/gtk.h>
#include <gtk-mac-bundle.h>
@@ -84,5 +84,5 @@ GType gtk_mac_attention_type_get_type (void);
G_END_DECLS
-#endif /* __x86_64__ */
+#endif /* __LP64__ */
#endif /* __GTK_MAC_DOCK_H__ */
diff --git a/src/gtk-mac-menu.c b/src/gtk-mac-menu.c
index e3cea97..04416ed 100644
--- a/src/gtk-mac-menu.c
+++ b/src/gtk-mac-menu.c
@@ -23,7 +23,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef __x86_64__
+#ifndef __LP64__
#include "config.h"
#include <gtk/gtk.h>
@@ -1369,4 +1369,4 @@ gtk_mac_menu_sync (GtkMenuShell *menu_shell)
carbon_menu->toplevel, DEBUG_SYNC);
}
-#endif /* __x86_64__ */
+#endif /* __LP64__ */
diff --git a/src/gtk-mac-menu.h b/src/gtk-mac-menu.h
index 85246d4..23d9bd6 100644
--- a/src/gtk-mac-menu.h
+++ b/src/gtk-mac-menu.h
@@ -25,7 +25,7 @@
#ifndef __GTK_MAC_MENU_H__
#define __GTK_MAC_MENU_H__
-#ifndef __x86_64__
+#ifndef __LP64__
#include <gtk/gtk.h>
@@ -46,5 +46,5 @@ void gtk_mac_menu_connect_window_key_handler (GtkWindow *window);
G_END_DECLS
-#endif /* __x86_64__ */
+#endif /* __LP64__ */
#endif /* __GTK_MAC_MENU_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]