Ticket #57874: patch-rename-macosx-macro.diff

src/gethelp.c

@@ -126 +126 @@
                                         *p = 0;
                                         fputs(t, outf);
                                         t = &p[7];
-                                        if (macosx()) {
+                                        if (is_macosx()) {
                                                 /* all the same size for roff 
                                                  *     #BKMOD#
                                                  */

src/libc/unix.h

@@ -74 +74 @@
 
 
 #ifdef  __APPLE__
-#define macosx()        1
+#define is_macosx()     1
 #else
-#define macosx()        0
+#define is_macosx()     0
 #endif
 
 /* tcp/tcp.c */

src/libc/win32.h

@@ -75 +75 @@
 #define mkpipe(p, size) pipe(p, size)
 
 #define win32()         1
-#define macosx()        0
+#define is_macosx()     0
 #define NOPROC
 #define ELOOP           40
 

src/port/gui.c

@@ -26 +26 @@
         char    *p;
 
         if ((p = getenv("BK_NO_GUI_PROMPT")) && *p) return (0);
-        if (win32() || macosx()) return ((p = getenv("BK_GUI")) && *p);
+        if (win32() || is_macosx()) return ((p = getenv("BK_GUI")) && *p);
         return (getenv("DISPLAY") && (p = getenv("BK_GUI")) && *p);
 }
 

src/port/uninstall.c

@@ -351 +351 @@
 
         dfd = efopen("BK_UNINSTALL_LOG");
 
-        if (macosx() && exists(MAC_PHFILE)) {
+        if (is_macosx() && exists(MAC_PHFILE)) {
                 ph = backtick("cat " MAC_PHFILE, 0);
                 /*
                  * Ensure that
@@ -435 +435 @@
                 free(cmd);
         }
 
-        if (macosx()) {
+        if (is_macosx()) {
                 /* figure out if we're in a bundle or not */
                 char    *bundle = fullname(bin, 0);
 
@@ -496 +496 @@
                 }
         }
         /* On OS X, bk 7.0.1 and later use path_helper(8). Remove that crumb. */
-        if (macosx() && removeph) {
+        if (is_macosx() && removeph) {
                 unlink(MAC_PHFILE);
         }
         rc = 0;

src/upgrade.c

@@ -131 +131 @@
         } else {
                 platform = bk_platform;
         }
-        if (macosx()) {
+        if (is_macosx()) {
                 /* figure out if we're in a bundle or not */
                 bundle = fullname(bin, 0);
                 if (p = strstr(bundle, "BitKeeper.app")) {
@@ -148 +148 @@
                 notice("upgrade-nomsys", 0, "-e");
                 goto out;
         }
-        if (!macosx() && install && noperms(bin)) {
+        if (!is_macosx() && install && noperms(bin)) {
                 notice("upgrade-badperms", bin, "-e");
                 goto out;
         }
@@ -216 +216 @@
                         unless (version) version = strdup(data[3]);
                         if (streq(data[5], platform)) {
                                 /* found this platform */
-                                if (macosx()) {
+                                if (is_macosx()) {
                                         /* if we hit a .bin, skip it. we
                                          * want the .pkg */
                                         p = strrchr(data[1], '.');
@@ -347 +347 @@
                 goto out;
         }
 #else
-        if (macosx()) {
+        if (is_macosx()) {
                 sprintf(buf, "/usr/bin/open -W %s", data[1]);
         } else {
                 sprintf(buf, "./%s -u", data[1]);