aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-09 17:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: fix compilation error on OpenBSD

Browse Source 
```

cc lightningd/subd.c
lightningd/subd.c:216:7: error: expected identifier or '('
                int stdout = STDOUT_FILENO, stderr = STDERR_FILENO;
                    ^
/usr/include/stdio.h:198:17: note: expanded from macro 'stdout'
                 ^
lightningd/subd.c:216:7: error: expected ')'
/usr/include/stdio.h:198:17: note: expanded from macro 'stdout'
                 ^
lightningd/subd.c:216:7: note: to match this '('
/usr/include/stdio.h:198:16: note: expanded from macro 'stdout'
                ^
lightningd/subd.c:224:12: error: cannot take the address of an rvalue of type 'FILE *' (aka 'struct __sFILE *')
                fds[1] = &stdout;
                         ^~~~~~~
lightningd/subd.c:225:12: error: cannot take the address of an rvalue of type 'FILE *' (aka 'struct __sFILE *')
                fds[2] = &stderr;
                         ^~~~~~~
4 errors generated.
gmake: *** [Makefile:279: lightningd/subd.o] Error 1
```

Changelog-None: introduced since last release.
Fixes: #4914
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> ```
This commit is contained in:
Rusty Russell
2021-11-16 10:37:43 +10:30
parent a294683675
commit d8c59fca77
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lightningd/subd.c
View File

@@ -213,7 +213,7 @@ static int subd(const char *path, const char *name,
size_t num_args;
char *args[] = { NULL, NULL, NULL, NULL, NULL };
int **fds = tal_arr(tmpctx, int *, 3);
int stdout = STDOUT_FILENO, stderr = STDERR_FILENO;
int stdoutfd = STDOUT_FILENO, stderrfd = STDERR_FILENO;
close(childmsg[0]);
close(execfail[0]);
@@ -221,8 +221,8 @@ static int subd(const char *path, const char *name,
/* msg = STDIN (0) */
fds[0] = &childmsg[1];
/* These are untouched */
fds[1] = &stdout;
fds[2] = &stderr;
fds[1] = &stdoutfd;
fds[2] = &stderrfd;
while ((fd = va_arg(*ap, int *)) != NULL) {
assert(*fd != -1);