Merge git://github.com/the-tcpdump-group/tcpdump

[tcpdump] / smb.h

diff --git a/smb.h b/smb.h
index eb25d14a36417f9ff79b66448002999636809525..88eaa06964227cd3667c4b8444fd72b14521c52f 100644 (file)
--- a/smb.h
+++ b/smb.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/smb.h,v 1.8 2002-06-11 17:09:00 itojun Exp $ (LBL) */
 /*
  * Copyright (C) Andrew Tridgell 1995-1999
  *
@@ -7,7 +6,8 @@
  * or later
  */
 
-#define SMBMIN(a,b) ((a)<(b)?(a):(b))
+/* for netdissect_options */
+#include "netdissect.h"
 
 /* the complete */
 #define SMBmkdir      0x00   /* create directory */
@@ -119,4 +119,4 @@
 #define PTR_DIFF(p1, p2) ((size_t)(((char *)(p1)) - (char *)(p2)))
 
 /* some protos */
-const u_char *smb_fdata(const u_char *, const char *, const u_char *);
+const u_char *smb_fdata(netdissect_options *, const u_char *, const char *, const u_char *, int);