diff options
| author | Lukas Larsson <[email protected]> | 2017-04-20 10:10:33 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-04-20 10:10:33 +0200 |
| commit | f9ccb1d717a7bffaaf149b6199412cfb092e692b (patch) | |
| tree | e35d2f288af9fb205116d23df100d0c3c28bd3b8 /erts/etc | |
| parent | c6e15b7226fab368babb60704e863cb17ba627ba (diff) | |
| parent | 8c665562272bac669ea400638d379f21495636af (diff) | |
| download | otp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.tar.gz otp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.tar.bz2 otp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.zip | |
Merge branch 'lukas/erts/20_minor_fixes'
* lukas/erts/20_minor_fixes:
erts: Rebuild etc executables if config.h changes
erts: Fix new gcc warning in check io
kernel: Add mem check to prim_file:large_write tc
erts: Fix two compiler warnings on OS X
erts: Fix erts_debug:df function info output
erts: Get rid of some unused function warnings on os x
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/Makefile.in | 2 | ||||
| -rw-r--r-- | erts/etc/unix/to_erl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in index d3af634729..f656eebc46 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -360,7 +360,7 @@ Install.ini: ../$(TARGET)/Install.src ../../vsn.mk $(TARGET)/Makefile else -RC_GENERATED = +RC_GENERATED = $(ERL_TOP)/erts/$(TARGET)/config.h endif #--------------------------------------------------------- # End of windows specific targets. diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c index 0bd469727c..0ccd7ead3e 100644 --- a/erts/etc/unix/to_erl.c +++ b/erts/etc/unix/to_erl.c @@ -416,7 +416,7 @@ int main(int argc, char **argv) if (len) { #ifdef DEBUG - if(write(1, buf, len)); + (void)write(1, buf, len); #endif if (write_all(wfd, buf, len) != len) { fprintf(stderr, "Error in writing to FIFO.\n"); |