Merge branch 'master' of nyus:/storage/git/netwatch

diff --combined lib/minilib.c
index 0e5786e59da9e502601f2ddd60c06a55b79d14d4,0407d3f386e66fc500f4aa1febccc6ef109a93e8..677c77ab614a9a4ffc235c0be3e848b2d3640e8c
--- 1/lib/minilib.c
--- 2/lib/minilib.c
+++ b/lib/minilib.c
@@@ -3,8 -3,8 +3,8 @@@
  
  void memcpy(void *dest, const void *src, int bytes)
  {
-       char * cdest = dest;
-       char * csrc = src;
+       char *cdest = dest;
+       const char *csrc = src;
        while (bytes--)
                *(cdest++) = *(csrc++);
  }
@@@ -81,8 -81,3 +81,8 @@@ void puthex(unsigned long l
        tohex(d, l);
        puts(d);
  }
 +
 +unsigned short htons(unsigned short in)
 +{
 +      return (in >> 8) | (in << 8);
 +}