--- libaitcrc/inc/aitcrc.h	2010/01/20 00:04:45	1.2
+++ libaitcrc/inc/aitcrc.h	2010/06/13 16:13:51	1.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcrc.h,v 1.2 2010/01/20 00:04:45 misho Exp $
+* $Id: aitcrc.h,v 1.3 2010/06/13 16:13:51 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITCRC_H
@@ -19,7 +19,7 @@
 
 struct tagCRCPoly {
 	u_char	poly_bits;
-	u_long	poly_num;
+	u_int	poly_num;
 	char	poly_name[19];
 };	// size 24bytes
 typedef struct tagCRCPoly crcPoly_t;
@@ -38,7 +38,7 @@ inline const char *crc_GetError();
  * @crcBits = Number width bits 
  * return: -1 error, !=-1 reflecting number
  */
-inline u_long crcReflect(u_long crcNum, u_char crcBits);
+inline u_int crcReflect(u_int crcNum, u_char crcBits);
 /*
  * crcCalc() Generic CRC calculation function for many sub variants of CRC algorithms
  * @psBuf = Data for calculation
@@ -49,7 +49,8 @@ inline u_long crcReflect(u_long crcNum, u_char crcBits
  * @xorCRC = Last xor CRC value
  * return: -1 error, !=-1 CRC checksum
  */
-inline u_long crcCalc(u_char * __restrict psBuf, u_int bufLen, u_char crcBits, u_char RevOpts, u_long initCRC, u_long xorCRC);
+inline u_int crcCalc(u_char * __restrict psBuf, u_int bufLen, u_char crcBits, 
+		u_char RevOpts, u_int initCRC, u_int xorCRC);
 
 /*
  * crcIP() Checksum in IP communication
@@ -59,19 +60,26 @@ inline u_long crcCalc(u_char * __restrict psBuf, u_int
  */
 inline u_short crcIP(u_short * __restrict nBuf, int bufLen);
 /*
- * crcFletcher() Fletcher-16 Checksum computing
+ * crcFletcher16() Fletcher-16 Checksum computing
  * @nBuf = Data for calculation
  * @bufLen = Length of data
  * return: -1 error, !=-1 Checksum
  */
-inline u_long crcFletcher(u_short * __restrict nBuf, int bufLen);
+inline u_short crcFletcher16(u_short * __restrict nBuf, int bufLen);
 /*
+ * crcFletcher() Fletcher-32 Checksum computing
+ * @nBuf = Data for calculation
+ * @bufLen = Length of data
+ * return: -1 error, !=-1 Checksum
+ */
+inline u_int crcFletcher(u_short * __restrict nBuf, int bufLen);
+/*
  * crcAdler() crcAdler-32 Checksum computing
  * @psBuf = Data for calculation
  * @bufLen = Length of data
  * return: -1 error, !=-1 Checksum
  */
-inline u_long crcAdler(u_char * __restrict psBuf, int bufLen);
+inline u_int crcAdler(u_char * __restrict psBuf, int bufLen);
 
 /*
  * crcEther() Checksum in Ethernet communication
@@ -79,7 +87,7 @@ inline u_long crcAdler(u_char * __restrict psBuf, int 
  * @bufLen = Length of data
  * return: -1 error, !=-1 Checksum
  */
-#define crcEther(psBuf, bufLen)		crcCalc((psBuf), (bufLen), 32, 3, 0xFFFFFFFF, 0xFFFFFFFF)
+#define crcEther(psBuf, bufLen) crcCalc((psBuf), (bufLen), 32, 3, 0xFFFFFFFF, 0xFFFFFFFF)
 
 /*
  * crcPelco() Calculate Pelco D/P CRC