Merge commit 'remotes/korg/cupcake' into cupcake_to_master

2 files changed, 10 insertions, 5 deletions

diff --git a/Android.mk b/Android.mk
index 5756432..32f2a89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES:=\
 LOCAL_CFLAGS:=-O2 -g
 #LOCAL_CFLAGS+=-DLINUX
 
-LOCAL_MODULE_TAGS:=tests eng
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 
diff --git a/netcat.c b/netcat.c
index 6c67718..c1d3f08 100644
--- a/netcat.c
+++ b/netcat.c
@@ -30,10 +30,14 @@
 
 /* conditional includes -- a very messy section which you may have to dink
    for your own architecture [and please send diffs...]: */
-/* #undef _POSIX_SOURCE		/* might need this for something? */
+#if 0
+#undef _POSIX_SOURCE		/* might need this for something? */
+#endif
 #define HAVE_BIND		/* ASSUMPTION -- seems to work everywhere! */
 #define HAVE_HELP		/* undefine if you dont want the help text */
-/* #define ANAL			/* if you want case-sensitive DNS matching */
+#if 0
+#define ANAL			/* if you want case-sensitive DNS matching */
+#endif
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -948,7 +952,7 @@ dol_err:
    Use the time delay between writes if given, otherwise use the "tcp ping"
    trick for getting the RTT.  [I got that idea from pluvius, and warped it.]
    Return either the original fd, or clean up and return -1. */
-udptest (fd, where)
+int udptest (fd, where)
   int fd;
   IA * where;
 {
@@ -1296,7 +1300,7 @@ Debug (("wrote %d to net, errno %d", rr, errno))
 
 /* main :
    now we pull it all together... */
-main (argc, argv)
+int main (argc, argv)
   int argc;
   char ** argv;
 {
@@ -1631,6 +1635,7 @@ Debug (("netfd %d from port %d to port %d", netfd, ourport, curport))
 #ifdef HAVE_HELP		/* unless we wanna be *really* cryptic */
 /* helpme :
    the obvious */
+void
 helpme()
 {
   o_verbose = 1;