Correct line-endings in the new header file.

FossilOrigin-Name: 94219b9f1ff59ea408c7ded167ee28b00c0f38c1

diff --git a/manifest b/manifest
index 41499ad4d092d69e387b3c25d7f89f0cd54bf602..e8fa1b920387e30b8f2eed7074ee0dfc2555a75b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\swork\son\sisolating\susage\sof\sthe\sWindows\sheader\sfile.
-D 2013-11-25T09:36:07.707
+C Correct\sline-endings\sin\sthe\snew\sheader\sfile.
+D 2013-11-25T09:37:24.023
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 16254fb023b7e69788013f0da5ccdc2063ba2328
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -207,7 +207,7 @@ F src/os.h cd8fd6545d6a936bae05026136324ec8e620c7f8
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 143624d9eabb3b997c59cf594e0d06c56edd43e9
 F src/os_win.c 423d8f815067f4980cb84abab501374afc9bd039
-F src/os_win.h db1d1d18f56ea2931ba1c2ec25ff4616ae1e581b
+F src/os_win.h ac253253d080dc3dd261efe5e98626c4b95e5a26
 F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
 F src/parse.y acee1a9958539e21263362b194594c5255ad2fca
@@ -1143,10 +1143,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 8f3c767a30c552548ead104ca125f182ce4849ad
-R e592d18e44da45424fc95ed6d55c4c01
-T *branch * winHdr
-T *sym-winHdr *
-T -sym-trunk *
+P 0d42c6b830ee50f45539d73e3948ed3bc50a11d1
+R 0e6472b71f09f9a7891e918b85232304
 U mistachkin
-Z 4118ce5841a2a285e11b8bcc9d8fe99e
+Z c441f2886dac757b12ddb73cf4ef6f57

diff --git a/manifest.uuid b/manifest.uuid
index 586356026fd2ce02013667ba4b26cded4283cebc..910f42306d956c3adf76f71a0689254af78b489a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d42c6b830ee50f45539d73e3948ed3bc50a11d1
\ No newline at end of file
+94219b9f1ff59ea408c7ded167ee28b00c0f38c1
\ No newline at end of file

diff --git a/src/os_win.h b/src/os_win.h
index 15e53b1789f744c3435a113dac082503c0305fef..6ccd9f48282611bac358ab1556da3a75a7d24e44 100644 (file)
--- a/src/os_win.h
+++ b/src/os_win.h
@@ -1,67 +1,67 @@
-/*\r
-** 2013 November 25\r
-**\r
-** The author disclaims copyright to this source code.  In place of\r
-** a legal notice, here is a blessing:\r
-**\r
-**    May you do good and not evil.\r
-**    May you find forgiveness for yourself and forgive others.\r
-**    May you share freely, never taking more than you give.\r
-**\r
-******************************************************************************\r
-**\r
-** This file contains code that is specific to Windows.\r
-*/\r
-#ifndef _OS_WIN_H_\r
-#define _OS_WIN_H_\r
-\r
-/*\r
-** Include the Windows SDK header file.\r
-*/\r
-#include "windows.h"\r
-\r
-#ifdef __CYGWIN__\r
-# include <sys/cygwin.h>\r
-# include <errno.h> /* amalgamator: keep */\r
-#endif\r
-\r
-/*\r
-** Determine if we are dealing with Windows NT.\r
-**\r
-** We ought to be able to determine if we are compiling for win98 or winNT\r
-** using the _WIN32_WINNT macro as follows:\r
-**\r
-** #if defined(_WIN32_WINNT)\r
-** # define SQLITE_OS_WINNT 1\r
-** #else\r
-** # define SQLITE_OS_WINNT 0\r
-** #endif\r
-**\r
-** However, vs2005 does not set _WIN32_WINNT by default, as it ought to,\r
-** so the above test does not work.  We'll just assume that everything is\r
-** winNT unless the programmer explicitly says otherwise by setting\r
-** SQLITE_OS_WINNT to 0.\r
-*/\r
-#if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)\r
-# define SQLITE_OS_WINNT 1\r
-#endif\r
-\r
-/*\r
-** Determine if we are dealing with WindowsCE - which has a much\r
-** reduced API.\r
-*/\r
-#if defined(_WIN32_WCE)\r
-# define SQLITE_OS_WINCE 1\r
-#else\r
-# define SQLITE_OS_WINCE 0\r
-#endif\r
-\r
-/*\r
-** Determine if we are dealing with WinRT, which provides only a subset of\r
-** the full Win32 API.\r
-*/\r
-#if !defined(SQLITE_OS_WINRT)\r
-# define SQLITE_OS_WINRT 0\r
-#endif\r
-\r
-#endif /* _OS_WIN_H_ */\r
+/*
+** 2013 November 25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains code that is specific to Windows.
+*/
+#ifndef _OS_WIN_H_
+#define _OS_WIN_H_
+
+/*
+** Include the Windows SDK header file.
+*/
+#include "windows.h"
+
+#ifdef __CYGWIN__
+# include <sys/cygwin.h>
+# include <errno.h> /* amalgamator: keep */
+#endif
+
+/*
+** Determine if we are dealing with Windows NT.
+**
+** We ought to be able to determine if we are compiling for win98 or winNT
+** using the _WIN32_WINNT macro as follows:
+**
+** #if defined(_WIN32_WINNT)
+** # define SQLITE_OS_WINNT 1
+** #else
+** # define SQLITE_OS_WINNT 0
+** #endif
+**
+** However, vs2005 does not set _WIN32_WINNT by default, as it ought to,
+** so the above test does not work.  We'll just assume that everything is
+** winNT unless the programmer explicitly says otherwise by setting
+** SQLITE_OS_WINNT to 0.
+*/
+#if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)
+# define SQLITE_OS_WINNT 1
+#endif
+
+/*
+** Determine if we are dealing with WindowsCE - which has a much
+** reduced API.
+*/
+#if defined(_WIN32_WCE)
+# define SQLITE_OS_WINCE 1
+#else
+# define SQLITE_OS_WINCE 0
+#endif
+
+/*
+** Determine if we are dealing with WinRT, which provides only a subset of
+** the full Win32 API.
+*/
+#if !defined(SQLITE_OS_WINRT)
+# define SQLITE_OS_WINRT 0
+#endif
+
+#endif /* _OS_WIN_H_ */