r9314 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r9313‎ | r9314 | r9315 >
Date:13:29, 3 June 2005
Author:kateturner
Status:old
Tags:
Comment:
fix compile on linux
Modified paths:
  • /trunk/tools/trickle/Makefile (modified) (history)
  • /trunk/tools/trickle/proto.c (modified) (history)
  • /trunk/tools/trickle/rdcp.c (modified) (history)
  • /trunk/tools/trickle/rdcp.h (modified) (history)
  • /trunk/tools/trickle/trickle.h (modified) (history)

Diff [purge]

Index: trunk/tools/trickle/trickle.h
@@ -13,6 +13,11 @@
1414
1515 #include <stdio.h>
1616
 17+#include "t_stdint.h"
 18+#ifdef T_STDINT
 19+# include <stdint.h>
 20+#endif
 21+
1722 #define min(x,y) ((x) < (y) ? (x) : (y))
1823 #define max(x,y) ((x) < (y) ? (y) : (x))
1924
Index: trunk/tools/trickle/proto.c
@@ -16,6 +16,11 @@
1717 #include <stdio.h>
1818 #include <strings.h>
1919
 20+#include "t_stdint.h"
 21+#ifdef T_STDINT
 22+# include <stdint.h>
 23+#endif
 24+
2025 #include "trickle.h"
2126 #include "rdcp.h"
2227
Index: trunk/tools/trickle/rdcp.c
@@ -10,8 +10,12 @@
1111 #include <stdlib.h>
1212 #include <unistd.h>
1313 #include <alloca.h>
14 -#include <xti.h>
1514
 15+#include "t_stdint.h"
 16+#ifdef T_STDINT
 17+# include <stdint.h>
 18+#endif
 19+
1620 #include "rdcp.h"
1721
1822 #define F_CLOSED 1
Index: trunk/tools/trickle/Makefile
@@ -1,9 +1,22 @@
22 # @(#) $Header$
33
4 -trickle: trickle.o tar.o proto.o util.o rdcp.o
5 - cc -g trickle.o tar.o proto.o util.o rdcp.o -o $@ -lsocket -lnsl
6 -.c.o: Makefile $<
 4+trickle: trickle.o tar.o proto.o util.o rdcp.o ldflags
 5+ cc -g trickle.o tar.o proto.o util.o rdcp.o -o $@ `cat ldflags`
 6+%.o: %.c Makefile $< t_stdint.h
77 cc -g -D_FILE_OFFSET_BITS=64 -c $<
88 clean:
9 - rm -f trickle trickle.o tar.o util.o rdcp.o proto.o
 9+ rm -f trickle trickle.o tar.o util.o rdcp.o proto.o ldflags t_stdint.h
 10+t_stdint.h:
 11+ rm -f t_stdint.h
 12+ touch t_stdint.h
 13+ echo "#include <stdint.h>" >test.c
 14+ -cc -c -o /dev/null test.c && echo "#define T_STDINT 1" >>t_stdint.h
 15+ rm -f test.c
 16+ldflags:
 17+ rm -f ldflags
 18+ touch ldflags
 19+ echo "main(){}" > test.c
 20+ -cc test.c -lsocket -lnsl -o /dev/null && echo -lsocket -lnsl >>ldflags
 21+ rm -f test.c
 22+
1023 .KEEP_STATE:
Index: trunk/tools/trickle/rdcp.h
@@ -11,6 +11,7 @@
1212
1313 #if defined(__SVR4) || defined(__svr4__)
1414 # define RDCP_SVR4
 15+# include <xti.h>
1516 #endif
1617
1718 /*

Status & tagging log