[Guy Harris <guy@xxxxxxxxxxxxxxxxxxx>]

guy         2001/05/20 22:17:15 CDT

  Modified files:
    .                    Makefile.nmake text2pcap.c 
  Log:
  Build text2pcap on Windows.
  
  Fix text2pcap.c so that it can be compiled with Microsoft Visual C++
  6.0:
  
  	protect some includes with #ifdefs, as not all the header files
  	in question exist in the MSVC++ build environment;
  
  	include <winsock.h> if we have it, to declare "ntohs()" and the
  	like;
  
  	include "getopt.h" if we need it, to declare stuff for
  	"getopt()";
  
  	include "config.h" if we have it, so we know whether the header
  	files in question exist or are needed;
  
  	rename "BYTE" to "READ_BYTE", as <winsock.h> defines BYTE as
  	well, and that definition causes a conflict;
  
  	get rid of references to "__FUNCTION__", as MSVC++ doesn't
  	define it (I suspect at least some UNIX compilers don't define
  	it, either).
  
  Revision  Changes    Path
  1.107     +13 -3     ethereal/Makefile.nmake
  1.2       +34 -31    ethereal/text2pcap.c