summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2018-05-25 09:56:04 +0200
committerFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2018-05-25 09:56:04 +0200
commit38e32cdf14e786bb818e18e73769d819794908b1 (patch)
tree1ff2fd00599d56526c0d6c3611a4804791665f9d
parent11736750e85850001075467ebb0ede1781278e4a (diff)
downloadtcpdump-38e32cdf14e786bb818e18e73769d819794908b1.tar.gz
Remove trailing spaces/tabs
-rw-r--r--CMakeLists.txt2
-rw-r--r--LICENSE6
-rw-r--r--README.md2
-rw-r--r--Readme.Win3212
-rw-r--r--win32/prj/GNUmakefile2
-rw-r--r--win32/prj/WinDump.dsp14
6 files changed, 19 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fb381e5..ff02c8bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,7 @@ endif()
# Get, parse, format and set tcpdump's version string from
# [tcpdump_root]/VERSION for later use.
-
+
# Get MAJOR, MINOR, PATCH & SUFFIX
file(STRINGS ${tcpdump_SOURCE_DIR}/VERSION
PACKAGE_VERSION
diff --git a/LICENSE b/LICENSE
index dea5f7d5..a10474d5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,9 +1,9 @@
License: BSD
-
+
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
@@ -13,7 +13,7 @@ are met:
3. The names of the authors may not 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.
diff --git a/README.md b/README.md
index aee7f492..98b17178 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Anonymous Git is available via:
git clone git://bpf.tcpdump.org/tcpdump
formerly from Lawrence Berkeley National Laboratory
- Network Research Group <tcpdump@ee.lbl.gov>
+ Network Research Group <tcpdump@ee.lbl.gov>
ftp://ftp.ee.lbl.gov/old/tcpdump.tar.Z (3.4)
This directory contains source code for tcpdump, a tool for network
diff --git a/Readme.Win32 b/Readme.Win32
index fdf8b12b..5027279a 100644
--- a/Readme.Win32
+++ b/Readme.Win32
@@ -1,9 +1,9 @@
To build tcpdump under Windows, you need:
-- version 6 (or higher) of Microsoft Visual Studio or the Cygnus gnu
+- version 6 (or higher) of Microsoft Visual Studio or the Cygnus gnu
C compiler.
-- The November 2001 (or later) edition of Microsoft Platform
-Software Development Kit (SDK), that contains some necessary includes
+- The November 2001 (or later) edition of Microsoft Platform
+Software Development Kit (SDK), that contains some necessary includes
for IPv6 support. You can download it from http://www.microsoft.com/sdk
- the WinPcap source code, that includes libpcap for win32. Download it
from http://winpcap.polito.it or download libpcap sources from
@@ -15,10 +15,10 @@ First, extract tcpdump and WinPcap in the same folder, and build WinPcap.
The Visual Studio project and the cygwin makefile are in the Win32\prj
folder.
-From Visual Studio, open windump.dsw and build the program. The release
-version of the WinDump.exe executable file will be created in the
+From Visual Studio, open windump.dsw and build the program. The release
+version of the WinDump.exe executable file will be created in the
windump\win32\prj\release directory . The debug version will be generated
in windump\win32\prj\debug.
From cygnus, go to windump\win32\prj\ and type "make". WinDump.exe will be
-created in the same directory. \ No newline at end of file
+created in the same directory.
diff --git a/win32/prj/GNUmakefile b/win32/prj/GNUmakefile
index d0504e3b..a7b63e8a 100644
--- a/win32/prj/GNUmakefile
+++ b/win32/prj/GNUmakefile
@@ -24,7 +24,7 @@ CFLAGS = -I ${PCAP_DIR}/wpcap/libpcap/bpf \
-D_U_="__attribute__((unused))" \
-D_WIN32_WINNT=0x0501 \
-mno-cygwin ${OPTFLAGS}
-LDFLAGS =
+LDFLAGS =
LIBS = -L ${PCAP_DIR}/WPCAP/LIB -lwpcap -lws2_32
OBJS = \
../../addrtoname.o \
diff --git a/win32/prj/WinDump.dsp b/win32/prj/WinDump.dsp
index 528bc28b..6f7276ee 100644
--- a/win32/prj/WinDump.dsp
+++ b/win32/prj/WinDump.dsp
@@ -7,19 +7,19 @@
CFG=WinDump - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "WinDump.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "WinDump.mak" CFG="WinDump - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "WinDump - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "WinDump - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 1
@@ -77,7 +77,7 @@ LINK32=link.exe
# ADD LINK32 wpcap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386 /out:"debug/WinDump.exe" /pdbtype:sept /libpath:"../../../winpcap/wpcap/lib"
# SUBTRACT LINK32 /pdb:none
-!ENDIF
+!ENDIF
# Begin Target