From: Jacob Potter <jacob@J4CBO-MBP-R7.RES.CMU.EDU>
Date: Thu, 2 Oct 2008 22:43:35 +0000 (-0400)
Subject: Merge branch 'master' of nyus:/storage/git/netwatch
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/3309f0f4c6885cc382fb6fa77493ae68bd4eb5b0?ds=inline;hp=-c

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

3309f0f4c6885cc382fb6fa77493ae68bd4eb5b0
diff --combined lib/minilib.c
index 0e5786e,0407d3f..677c77a
--- a/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);
 +}