Changeset 559cd60 in git for src/message.c


Ignore:
Timestamp:
04/09/19 03:25:57 (7 weeks ago)
Author:
Olly Betts <olly@…>
Branches:
master
Children:
b74755e
Parents:
7061908
Message:

Consistently refer to macOS not OS X, etc

Apple renamed it yet again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/message.c

    r7061908 r559cd60  
    894894{
    895895   char *p;
    896 #if OS_UNIX_MACOSX
    897    int msg_macosx_relocatable = 0;
     896#if OS_UNIX_MACOS
     897   int msg_macos_relocatable = 0;
    898898#endif
    899899   SVX_ASSERT(argv);
     
    932932      if (pth[0]) {
    933933         struct stat buf;
    934 #if OS_UNIX_MACOSX
     934#if OS_UNIX_MACOS
    935935# ifndef AVEN
    936          /* On MacOS X the programs may be installed anywhere, with the
     936         /* On macOS the programs may be installed anywhere, with the
    937937          * share directory and the binaries in the same directory. */
    938938         p = use_path(pth, "share/survex/en.msg");
    939939         if (stat(p, &buf) == 0 && S_ISREG(buf.st_mode)) {
    940940            pth_cfg_files = use_path(pth, "share/survex");
    941             msg_macosx_relocatable = 1;
    942             goto macosx_got_msg;
     941            msg_macos_relocatable = 1;
     942            goto macos_got_msg;
    943943         }
    944944         osfree(p);
     
    951951         if (stat(p, &buf) == 0 && S_ISREG(buf.st_mode)) {
    952952            pth_cfg_files = use_path(pth, "../Resources");
    953             msg_macosx_relocatable = 1;
    954             goto macosx_got_msg;
     953            msg_macos_relocatable = 1;
     954            goto macos_got_msg;
    955955         }
    956956         osfree(p);
     
    975975         }
    976976#if defined(__GNUC__) && defined(__APPLE_CC__)
    977 macosx_got_msg:
     977macos_got_msg:
    978978#endif
    979979         osfree(p);
Note: See TracChangeset for help on using the changeset viewer.