patch-2.4.9 linux/fs/ncpfs/ncpsign_kernel.c

• Lines: 18
• Date: Wed Aug 15 01:22:16 2001
• Orig file: v2.4.8/linux/fs/ncpfs/ncpsign_kernel.c
• Orig date: Mon Mar 30 16:40:37 1998

diff -u --recursive --new-file v2.4.8/linux/fs/ncpfs/ncpsign_kernel.c linux/fs/ncpfs/ncpsign_kernel.c
@@ -52,8 +52,6 @@
 #define PUT_LE32(p,v) DSET_LH(p,0,v)
 #endif
 
-#define min(a,b) ((a)<(b)?(a):(b))
-
 static void nwsign(char *r_data1, char *r_data2, char *outdata) {
  int i;
  unsigned int w0,w1,w2,w3;
@@ -102,7 +100,7 @@
  memcpy(data,server->sign_root,8);
  PUT_LE32(data+8,(*size));
  memcpy(data+12,server->packet+sizeof(struct ncp_request_header)-1,
-  min((*size)-sizeof(struct ncp_request_header)+1,52));
+  min(unsigned int,(*size)-sizeof(struct ncp_request_header)+1,52));
 
  nwsign(server->sign_last,data,server->sign_last);