diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-03-03 21:52:11 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-03-04 03:13:42 +0000 |
| commit | dec951ef883fd7ff14ab87e16cd8543fe34422cb (patch) | |
| tree | d76fd4a97e4c0a41001e5f9b252ade63055a658a /config.nmake | |
| parent | 83b994909b7e0b0a95c1b1bb9e080e5e98c2bb70 (diff) | |
(Trivial) Fix 2 typos; Reformat some long lines.
Change-Id: If7d009b7764e858bd210d613ac9af219e9e20464
Reviewed-on: https://code.wireshark.org/review/491
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index 8a01829858..02fa27e0e1 100644 --- a/config.nmake +++ b/config.nmake @@ -776,7 +776,7 @@ CYGWIN_PATH=c:\cygwin\bin SH_PROG=bash # bash versions after 3.1.6 need the 'igncr' shell option to be able to -# process scripts in windows 'native format' (dos crlf format). +# process scripts in Windows 'native format' (dos crlf format). # The following !IF results in the option being used only if it is available # since using it on bash version 3.1.6 (or earlier) is not required and # will cause an error message. @@ -952,12 +952,12 @@ APPVER=5.02 # /DWIN32_LEAN_AND_MEAN Don't include unnecessary Windows include files (see windows.h). # /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load # a second copy of the CRT. -# -DPSAPI_VERSION=1 Programs that must run on earlier versions of Windows as well as Windows 7 and later -# versions should always call this function as GetProcessMemoryInfo. To ensure correct resolution of symbols, -# add Psapi.lib to the TARGETLIBS macro and compile the program with -DPSAPI_VERSION=1. -# To use run-time dynamic linking, load Psapi.dll. +# -DPSAPI_VERSION=1 Programs that must run on earlier versions of Windows as well as Windows 7 and later +# versions should always call this function as GetProcessMemoryInfo. To ensure correct +# resolution of symbols, add Psapi.lib to the TARGETLIBS macro and compile the program +# with -DPSAPI_VERSION=1.To use run-time dynamic linking, load Psapi.dll. # http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx -# -DBUILD_WINDOWS Starting from VS2103, GetVersionEx is deprecated and we are recommended to use +# -DBUILD_WINDOWS Starting from VS2013, GetVersionEx is deprecated and we are recommended to use # VerifyVersionInfo instead # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724429(v=vs.85).aspx # http://msdn.microsoft.com/en-us/library/windows/desktop/ms725491(v=vs.85).aspx |