--- libaitrpc/inc/aitrpc.h	2010/07/08 12:29:38	1.1.1.1.2.21
+++ libaitrpc/inc/aitrpc.h	2011/05/02 23:12:08	1.2
@@ -3,9 +3,46 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.1.1.1.2.21 2010/07/08 12:29:38 misho Exp $
+* $Id: aitrpc.h,v 1.2 2011/05/02 23:12:08 misho Exp $
 *
-*************************************************************************/
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #ifndef __AITRPC_H
 #define __AITRPC_H
 
@@ -15,7 +52,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/param.h>
+#if !defined(__NetBSD__)
 #include <sys/limits.h>
+#endif
 #include <sys/socket.h>
 
 
@@ -153,15 +192,16 @@ typedef struct {
 					} while (0)
 
 
-#define RPC_CALLBACK_CHK_RETARGS(f, n)	do { \
-						if (f->func_args != n) { \
-							rpc_SetErr(22, "Error:: different number of arguments!\n"); \
+#define RPC_CALLBACK_CHECK_INPUT(x)	do { \
+						if (!x) { \
+							rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \
 							return -1; \
 						} \
 					} while (0)
-#define RPC_CALLBACK_CHECK_INPUT(f)	do { \
-						if (!f) { \
-							rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \
+#define RPC_CALLBACK_CHK_ARGS(f, n)	do { \
+						RPC_CALLBACK_CHECK_INPUT(f); \
+						if (f && f->func_args != n) { \
+							rpc_SetErr(22, "Error:: different number of arguments!\n"); \
 							return -1; \
 						} \
 					} while (0)