diff options
| author | Alan Third | 2021-06-29 22:17:20 +0100 |
|---|---|---|
| committer | Alan Third | 2021-06-29 22:18:33 +0100 |
| commit | 1dba0ca278f8185912e8d39b2af05fc6739b65f8 (patch) | |
| tree | 115790b8663ba715e52234d223d53795147412a4 | |
| parent | 94a2ef436b857d8b9909d8629190bd3fbb1be5d7 (diff) | |
| download | emacs-1dba0ca278f8185912e8d39b2af05fc6739b65f8.tar.gz emacs-1dba0ca278f8185912e8d39b2af05fc6739b65f8.zip | |
Fix NS port built with gcc
* src/nsterm.m (ns_relocate): The NSArray shorthand notation doesn't
work in GCC.
| -rw-r--r-- | src/nsterm.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 8497138039c..dc5ecc45640 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -511,7 +511,9 @@ ns_relocate (const char *epath) | |||
| 511 | NSBundle *bundle = [NSBundle mainBundle]; | 511 | NSBundle *bundle = [NSBundle mainBundle]; |
| 512 | NSString *root = [bundle bundlePath]; | 512 | NSString *root = [bundle bundlePath]; |
| 513 | NSString *original = [NSString stringWithUTF8String:epath]; | 513 | NSString *original = [NSString stringWithUTF8String:epath]; |
| 514 | NSString *fixedPath = [NSString pathWithComponents:@[root, original]]; | 514 | NSString *fixedPath = [NSString pathWithComponents: |
| 515 | [NSArray arrayWithObjects: | ||
| 516 | root, original, nil]]; | ||
| 515 | NSFileManager *fileManager = [NSFileManager defaultManager]; | 517 | NSFileManager *fileManager = [NSFileManager defaultManager]; |
| 516 | 518 | ||
| 517 | if (![original isAbsolutePath] | 519 | if (![original isAbsolutePath] |