| Index: trunk/tools/trickle/Makefile |
| — | — | @@ -12,20 +12,20 @@ |
| 13 | 13 | rm -f trickle trickle.o tar.o util.o rdcp.o proto.o ldflags $(CFGHDRS) |
| 14 | 14 | t_sysparam.h: |
| 15 | 15 | echo "#include <sys/param.h>" >test.c |
| 16 | | - -($(CC) -c -o /dev/null test.c && echo "#define T_SYS_PARAM_H 1") >t_sysparam.h |
| 17 | | - rm -f test.c |
| | 16 | + -($(CC) -c -o _conftest test.c && echo "#define T_SYS_PARAM_H 1") >t_sysparam.h |
| | 17 | + rm -f test.c _conftest |
| 18 | 18 | t_stdint.h: |
| 19 | 19 | echo "#include <stdint.h>" >test.c |
| 20 | | - -($(CC) -c -o /dev/null test.c && echo "#define T_STDINT 1") >t_stdint.h |
| 21 | | - rm -f test.c |
| | 20 | + -($(CC) -c -o _conftest test.c && echo "#define T_STDINT 1") >t_stdint.h |
| | 21 | + rm -f test.c _conftest |
| 22 | 22 | t_xti.h: |
| 23 | 23 | echo "#include <xti.h>" >test.c |
| 24 | | - -($(CC) -c -o /dev/null test.c && echo "#define T_XTI 1") >t_xti.h |
| 25 | | - rm -f test.c |
| | 24 | + -($(CC) -c -o _conftest test.c && echo "#define T_XTI 1") >t_xti.h |
| | 25 | + rm -f test.c _conftest |
| 26 | 26 | t_alloca.h: |
| 27 | 27 | echo "#include <alloca.h>" >test.c |
| 28 | | - -($(CC) -c -o /dev/null test.c && echo "#define T_ALLOCA 1") >t_alloca.h |
| 29 | | - rm -f test.c |
| | 28 | + -($(CC) -c -o _conftest test.c && echo "#define T_ALLOCA 1") >t_alloca.h |
| | 29 | + rm -f test.c _conftest |
| 30 | 30 | ldflags: |
| 31 | 31 | echo "int main() { return 0; }" > test.c |
| 32 | 32 | -($(CC) test.c -lsocket -lnsl -o _conftest && echo -lsocket -lnsl) >ldflags |
| Index: trunk/tools/trickle/util.c |
| — | — | @@ -78,7 +78,7 @@ |
| 79 | 79 | fprintf(stderr, "%s: %s (%s)\n", e, strerror(errno), c); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | | -#if defined(__sun) && !defined(__svr4) |
| | 82 | +#if defined(__sun) && !defined(__svr4__) |
| 83 | 83 | extern int sys_nerr; |
| 84 | 84 | extern char *sys_errlist[]; |
| 85 | 85 | |