Uthernet: removed unused Bittypes.h & Pcap-stdinc.h

AppleWinExpress2008.vcproj

@@ -429,10 +429,6 @@
 			<Filter
 				Name="Uthernet"
 				>
-				<File
-					RelativePath=".\source\Tfe\Bittypes.h"
-					>
-				</File>
 				<File
 					RelativePath=".\source\Tfe\Bpf.h"
 					>
@@ -441,10 +437,6 @@
 					RelativePath=".\source\Tfe\Ip6_misc.h"
 					>
 				</File>
-				<File
-					RelativePath=".\source\Tfe\Pcap-stdinc.h"
-					>
-				</File>
 				<File
 					RelativePath=".\source\Tfe\Pcap.h"
 					>

AppleWinExpress2019.vcxproj

@@ -112,10 +112,8 @@
     <ClInclude Include="source\StdAfx.h" />
     <ClInclude Include="source\SynchronousEventManager.h" />
     <ClInclude Include="source\Tape.h" />
-    <ClInclude Include="source\Tfe\Bittypes.h" />
     <ClInclude Include="source\Tfe\Bpf.h" />
     <ClInclude Include="source\Tfe\Ip6_misc.h" />
-    <ClInclude Include="source\Tfe\Pcap-stdinc.h" />
     <ClInclude Include="source\Tfe\Pcap.h" />
     <ClInclude Include="source\Tfe\tfe.h" />
     <ClInclude Include="source\Tfe\tfearch.h" />

AppleWinExpress2019.vcxproj.filters

@@ -252,9 +252,6 @@
     <ClInclude Include="source\AY8910.h">
       <Filter>Source Files\Emulator</Filter>
     </ClInclude>
-    <ClInclude Include="source\Tfe\Bittypes.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
     <ClInclude Include="source\Tfe\Bpf.h">
       <Filter>Source Files\Uthernet</Filter>
     </ClInclude>
@@ -393,9 +390,6 @@
     <ClInclude Include="source\Tfe\Pcap.h">
       <Filter>Source Files\Uthernet</Filter>
     </ClInclude>
-    <ClInclude Include="source\Tfe\Pcap-stdinc.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
     <ClInclude Include="source\Configuration\PropertySheet.h">
       <Filter>Source Files\Configuration</Filter>
     </ClInclude>

source/Tfe/Bittypes.h

@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 1999 WIDE Project.
- * 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. Neither the name of the project 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 THE PROJECT 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 PROJECT 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 _BITTYPES_H
-#define _BITTYPES_H
-
-#ifndef HAVE_U_INT8_T
-
-#if SIZEOF_CHAR == 1
-typedef unsigned char u_int8_t;
-typedef signed char int8_t;
-#elif SIZEOF_INT == 1
-typedef unsigned int u_int8_t;
-typedef signed int int8_t;
-#else  /* XXX */
-#error "there's no appropriate type for u_int8_t"
-#endif
-#define HAVE_U_INT8_T 1
-#define HAVE_INT8_T 1
-
-#endif /* HAVE_U_INT8_T */
-
-#ifndef HAVE_U_INT16_T 
-
-#if SIZEOF_SHORT == 2
-typedef unsigned short u_int16_t;
-typedef signed short int16_t;
-#elif SIZEOF_INT == 2
-typedef unsigned int u_int16_t;
-typedef signed int int16_t;
-#elif SIZEOF_CHAR == 2
-typedef unsigned char u_int16_t;
-typedef signed char int16_t;
-#else  /* XXX */
-#error "there's no appropriate type for u_int16_t"
-#endif
-#define HAVE_U_INT16_T 1
-#define HAVE_INT16_T 1
-
-#endif /* HAVE_U_INT16_T */
-
-#ifndef HAVE_U_INT32_T
-
-#if SIZEOF_INT == 4
-typedef unsigned int u_int32_t;
-typedef signed int int32_t;
-#elif SIZEOF_LONG == 4
-typedef unsigned long u_int32_t;
-typedef signed long int32_t;
-#elif SIZEOF_SHORT == 4
-typedef unsigned short u_int32_t;
-typedef signed short int32_t;
-#else  /* XXX */
-#error "there's no appropriate type for u_int32_t"
-#endif
-#define HAVE_U_INT32_T 1
-#define HAVE_INT32_T 1
-
-#endif /* HAVE_U_INT32_T */
-
-#endif /* _BITTYPES_H */

source/Tfe/Pcap-stdinc.h

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2002
- *	Politecnico di Torino.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the Politecnico
- * di Torino, and its contributors.'' Neither the name of
- * the University 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header$ (LBL)
- */
-
-#define SIZEOF_CHAR 1
-#define SIZEOF_SHORT 2
-#define SIZEOF_INT 4
-
-#define _WINSOCKAPI_
-#include <fcntl.h>
-
-#include <winsock2.h>
-#include "bittypes.h"
-#include <time.h>
-#include <io.h>
-
-#ifndef __MINGW32__
-#include "IP6_misc.h"
-#endif
-
-#define caddr_t char*
-
-// TC: TfeArch.cpp includes pcap.h (before stdio.h), which includes Pcap_stdinc.h which redefines: snprintf & vsnprintf
-// - This causes VC++2008 Express to give a compile error for stdio.h!
-//#define snprintf _snprintf
-//#define vsnprintf _vsnprintf
-

source/Tfe/Pcap.h

@@ -38,8 +38,8 @@
 #define lib_pcap_h
 
 #ifdef WIN32
-/* RGJ Changed it to "pcap-stdinc.h" for AppleWin */
+/* TC Changed it to "winsock2.h" for AppleWin */
-#include "pcap-stdinc.h"
+#include <winsock2.h>
 #else /* WIN32 */
 #include <sys/types.h>
 #include <sys/time.h>