Restoring authorship annotation for Nikita Slyusarev <nslus@yandex-team.com>. Commit 2 of 2.

13 files changed, 124 insertions, 124 deletions

diff --git a/contrib/tools/bison/gnulib/platform/win64/config.h b/contrib/tools/bison/gnulib/platform/win64/config.h
index fe0c8e9e0a..cf3d366e18 100644
--- a/contrib/tools/bison/gnulib/platform/win64/config.h
+++ b/contrib/tools/bison/gnulib/platform/win64/config.h
@@ -1,8 +1,8 @@
 /* lib/config.h.  Generated from config.hin by configure.  */
 /* lib/config.hin.  Generated from configure.ac by autoheader.  */
 
-#include <contrib/tools/bison/gnulib/win_sdk10.h> 
- 
+#include <contrib/tools/bison/gnulib/win_sdk10.h>
+
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
@@ -1240,11 +1240,11 @@ char *strsignal (int signum);
 #define PACKAGE_VERSION "3.0.0"
 
 /* the number of pending output bytes on stream 'fp' */
-#if WIN_SDK10 
-#define PENDING_OUTPUT_N_BYTES ((TWinSdk10File*)fp)->_ptr - ((TWinSdk10File*)fp)->_base 
-#else 
+#if WIN_SDK10
+#define PENDING_OUTPUT_N_BYTES ((TWinSdk10File*)fp)->_ptr - ((TWinSdk10File*)fp)->_base
+#else
 #define PENDING_OUTPUT_N_BYTES fp->_ptr - fp->_base
-#endif 
+#endif
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */
diff --git a/contrib/tools/bison/gnulib/platform/win64/fcntl.h b/contrib/tools/bison/gnulib/platform/win64/fcntl.h
index 11832d987e..dd3a1e5208 100644
--- a/contrib/tools/bison/gnulib/platform/win64/fcntl.h
+++ b/contrib/tools/bison/gnulib/platform/win64/fcntl.h
@@ -38,11 +38,11 @@
 #if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
 # include <sys/stat.h>
 #endif
-#if _MSC_VER >= 1900 
-#include <../ucrt/fcntl.h> 
-#else 
-#include <../include/fcntl.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/fcntl.h>
+#else
+#include <../include/fcntl.h>
+#endif
 
 #else
 /* Normal invocation convention.  */
@@ -62,11 +62,11 @@
 # include <sys/stat.h>
 #endif
 /* The include_next requires a split double-inclusion guard.  */
-#if _MSC_VER >= 1900 
-#include <../ucrt/fcntl.h> 
-#else 
-#include <../include/fcntl.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/fcntl.h>
+#else
+#include <../include/fcntl.h>
+#endif
 
 #ifndef _GL_M4_FCNTL_H
 #define _GL_M4_FCNTL_H
diff --git a/contrib/tools/bison/gnulib/platform/win64/locale.h b/contrib/tools/bison/gnulib/platform/win64/locale.h
index 215996afd3..ddebf413d2 100644
--- a/contrib/tools/bison/gnulib/platform/win64/locale.h
+++ b/contrib/tools/bison/gnulib/platform/win64/locale.h
@@ -25,11 +25,11 @@
 /* Special invocation conventions to handle Solaris header files
    (through Solaris 10) when combined with gettext's libintl.h.  */
 
-#if _MSC_VER >= 1900 
-#include <../ucrt/locale.h> 
-#else 
-#include <../include/locale.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/locale.h>
+#else
+#include <../include/locale.h>
+#endif
 
 #else
 /* Normal invocation convention.  */
@@ -39,11 +39,11 @@
 #define _GL_ALREADY_INCLUDING_LOCALE_H
 
 /* The include_next requires a split double-inclusion guard.  */
-#if _MSC_VER >= 1900 
-#include <../ucrt/locale.h> 
-#else 
-#include <../include/locale.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/locale.h>
+#else
+#include <../include/locale.h>
+#endif
 
 #undef _GL_ALREADY_INCLUDING_LOCALE_H
 
diff --git a/contrib/tools/bison/gnulib/platform/win64/math.h b/contrib/tools/bison/gnulib/platform/win64/math.h
index a8caa9a729..b2a0023d11 100644
--- a/contrib/tools/bison/gnulib/platform/win64/math.h
+++ b/contrib/tools/bison/gnulib/platform/win64/math.h
@@ -24,11 +24,11 @@
 
 
 /* The include_next requires a split double-inclusion guard.  */
-#if _MSC_VER >= 1900 
-#include <../ucrt/math.h> 
-#else 
-#include <../include/math.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/math.h>
+#else
+#include <../include/math.h>
+#endif
 
 #ifndef _GL_M4_MATH_H
 #define _GL_M4_MATH_H
diff --git a/contrib/tools/bison/gnulib/platform/win64/signal.h b/contrib/tools/bison/gnulib/platform/win64/signal.h
index c081ae87e2..11f3a81cf5 100644
--- a/contrib/tools/bison/gnulib/platform/win64/signal.h
+++ b/contrib/tools/bison/gnulib/platform/win64/signal.h
@@ -33,11 +33,11 @@
      In this situation, some of the functions are not yet declared, therefore
      we cannot provide the C++ aliases.  */
 
-#if _MSC_VER >= 1900 
-#include <../ucrt/signal.h> 
-#else 
-#include <../include/signal.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/signal.h>
+#else
+#include <../include/signal.h>
+#endif
 
 #else
 /* Normal invocation convention.  */
@@ -53,11 +53,11 @@
 #include <sys/types.h>
 
 /* The include_next requires a split double-inclusion guard.  */
-#if _MSC_VER >= 1900 
-#include <../ucrt/signal.h> 
-#else 
-#include <../include/signal.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/signal.h>
+#else
+#include <../include/signal.h>
+#endif
 
 #undef _GL_ALREADY_INCLUDING_SIGNAL_H
 
diff --git a/contrib/tools/bison/gnulib/platform/win64/sys/stat.h b/contrib/tools/bison/gnulib/platform/win64/sys/stat.h
index 0f18e52276..429d3886dc 100644
--- a/contrib/tools/bison/gnulib/platform/win64/sys/stat.h
+++ b/contrib/tools/bison/gnulib/platform/win64/sys/stat.h
@@ -29,11 +29,11 @@
 #if defined __need_system_sys_stat_h
 /* Special invocation convention.  */
 
-#if _MSC_VER >= 1900 
-#include <../ucrt/sys/stat.h> 
-#else 
-#include <../include/sys/stat.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/sys/stat.h>
+#else
+#include <../include/sys/stat.h>
+#endif
 
 #else
 /* Normal invocation convention.  */
@@ -48,11 +48,11 @@
 #include <time.h>
 
 /* The include_next requires a split double-inclusion guard.  */
-#if _MSC_VER >= 1900 
-#include <../ucrt/sys/stat.h> 
-#else 
-#include <../include/sys/stat.h> 
-#endif 
+#if _MSC_VER >= 1900
+#include <../ucrt/sys/stat.h>
+#else
+#include <../include/sys/stat.h>
+#endif
 
 #ifndef _GL_M4_SYS_STAT_H
 #define _GL_M4_SYS_STAT_H
diff --git a/contrib/tools/bison/gnulib/src/fpurge.c b/contrib/tools/bison/gnulib/src/fpurge.c
index 21104cce3a..6c74355b71 100644
--- a/contrib/tools/bison/gnulib/src/fpurge.c
+++ b/contrib/tools/bison/gnulib/src/fpurge.c
@@ -101,11 +101,11 @@ fpurge (FILE *fp)
   if (fp->_ptr != NULL)
     fp->_cnt = 0;
   return 0;
-# elif WIN_SDK10 
-  ((TWinSdk10File*)fp)->_ptr = ((TWinSdk10File*)fp)->_base; 
-  if (((TWinSdk10File*)fp)->_ptr != NULL) 
-    ((TWinSdk10File*)fp)->_cnt = 0; 
-  return 0; 
+# elif WIN_SDK10
+  ((TWinSdk10File*)fp)->_ptr = ((TWinSdk10File*)fp)->_base;
+  if (((TWinSdk10File*)fp)->_ptr != NULL)
+    ((TWinSdk10File*)fp)->_cnt = 0;
+  return 0;
 # elif defined __UCLIBC__           /* uClibc */
 #  ifdef __STDIO_BUFFERS
   if (fp->__modeflags & __FLAG_WRITING)
diff --git a/contrib/tools/bison/gnulib/src/freadahead.c b/contrib/tools/bison/gnulib/src/freadahead.c
index d06ace35c3..bf53271fd2 100644
--- a/contrib/tools/bison/gnulib/src/freadahead.c
+++ b/contrib/tools/bison/gnulib/src/freadahead.c
@@ -56,10 +56,10 @@ freadahead (FILE *fp)
   if ((fp_->_flag & _IOWRT) != 0)
     return 0;
   return fp_->_cnt;
-#elif WIN_SDK10 
-  if ((((TWinSdk10File*)fp)->_flags & WIN_SDK10_IOWRITE) != 0) 
-    return 0; 
-  return ((TWinSdk10File*)fp)->_cnt; 
+#elif WIN_SDK10
+  if ((((TWinSdk10File*)fp)->_flags & WIN_SDK10_IOWRITE) != 0)
+    return 0;
+  return ((TWinSdk10File*)fp)->_cnt;
 #elif defined __UCLIBC__            /* uClibc */
 # ifdef __STDIO_BUFFERS
   if (fp->__modeflags & __FLAG_WRITING)
diff --git a/contrib/tools/bison/gnulib/src/freading.c b/contrib/tools/bison/gnulib/src/freading.c
index 1ab8fb4aa1..3d7e4e56f0 100644
--- a/contrib/tools/bison/gnulib/src/freading.c
+++ b/contrib/tools/bison/gnulib/src/freading.c
@@ -47,8 +47,8 @@ freading (FILE *fp)
 #  else
   return (fp->_flag & _IOREAD) != 0;
 #  endif
-# elif WIN_SDK10 
-  return (((TWinSdk10File*)fp)->_flags & WIN_SDK10_IOREAD) != 0; 
+# elif WIN_SDK10
+  return (((TWinSdk10File*)fp)->_flags & WIN_SDK10_IOREAD) != 0;
 # elif defined __UCLIBC__            /* uClibc */
   return (fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) != 0;
 # elif defined __QNX__               /* QNX */
diff --git a/contrib/tools/bison/gnulib/src/fseeko.c b/contrib/tools/bison/gnulib/src/fseeko.c
index de838f01a4..16404b71eb 100644
--- a/contrib/tools/bison/gnulib/src/fseeko.c
+++ b/contrib/tools/bison/gnulib/src/fseeko.c
@@ -82,9 +82,9 @@ fseeko (FILE *fp, off_t offset, int whence)
 #elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   if (fp_->_ptr == fp_->_base
       && (fp_->_ptr == NULL || fp_->_cnt == 0))
-#elif WIN_SDK10 
-  if (((TWinSdk10File*)fp)->_ptr == ((TWinSdk10File*)fp)->_base 
-      && (((TWinSdk10File*)fp)->_ptr == NULL || ((TWinSdk10File*)fp)->_cnt == 0)) 
+#elif WIN_SDK10
+  if (((TWinSdk10File*)fp)->_ptr == ((TWinSdk10File*)fp)->_base
+      && (((TWinSdk10File*)fp)->_ptr == NULL || ((TWinSdk10File*)fp)->_cnt == 0))
 #elif defined __UCLIBC__            /* uClibc */
   if (((fp->__modeflags & __FLAG_WRITING) == 0
        || fp->__bufpos == fp->__bufstart)
diff --git a/contrib/tools/bison/gnulib/src/fseterr.c b/contrib/tools/bison/gnulib/src/fseterr.c
index be36991486..9f7bea13b3 100644
--- a/contrib/tools/bison/gnulib/src/fseterr.c
+++ b/contrib/tools/bison/gnulib/src/fseterr.c
@@ -39,8 +39,8 @@ fseterr (FILE *fp)
   fp->_flags |= _IOERR;
 #elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
   fp_->_flag |= _IOERR;
-#elif WIN_SDK10 
-  ((TWinSdk10File*)fp)->_flags |= WIN_SDK10_IOERROR; 
+#elif WIN_SDK10
+  ((TWinSdk10File*)fp)->_flags |= WIN_SDK10_IOERROR;
 #elif defined __UCLIBC__            /* uClibc */
   fp->__modeflags |= __FLAG_ERROR;
 #elif defined __QNX__               /* QNX */
diff --git a/contrib/tools/bison/gnulib/src/snprintf.c b/contrib/tools/bison/gnulib/src/snprintf.c
index af0d87d673..9c34de3bb2 100644
--- a/contrib/tools/bison/gnulib/src/snprintf.c
+++ b/contrib/tools/bison/gnulib/src/snprintf.c
@@ -28,7 +28,7 @@
 
 #include "vasnprintf.h"
 
-#if defined(_MSC_VER) && _MSC_VER < 1900 
+#if defined(_MSC_VER) && _MSC_VER < 1900
 /* Print formatted output to string STR.  Similar to sprintf, but
    additional length SIZE limit how much is written into STR.  Returns
    string length of formatted string (which may be larger than SIZE).
@@ -73,4 +73,4 @@ snprintf (char *str, size_t size, const char *format, ...)
 
   return len;
 }
-#endif 
+#endif
diff --git a/contrib/tools/bison/gnulib/win_sdk10.h b/contrib/tools/bison/gnulib/win_sdk10.h
index fdf8dc9e20..76e5c86ccd 100644
--- a/contrib/tools/bison/gnulib/win_sdk10.h
+++ b/contrib/tools/bison/gnulib/win_sdk10.h
@@ -1,55 +1,55 @@
-#pragma once 
- 
-#if defined(_MSC_VER) 
- 
-#include <ntverp.h> 
- 
-// Check for Windows SDK 10+ 
-#if defined(VER_PRODUCTBUILD) && VER_PRODUCTBUILD >= 9600 
-#define WIN_SDK10 1 
-#else 
-#define WIN_SDK10 0 
-#endif 
- 
-// Since Windows SDK 10 FILE is an internal opaque structure with no backward compatibility. 
-// This code has been transplanted from Windows SDK 
-// corecrt_internal_stdio.h 
- 
-// __crt_stdio_stream_data 
-#if WIN_SDK10 
-typedef struct { 
-    union { 
-        void* _public_file; 
-        char* _ptr; 
-    }; 
- 
-    char* _base; 
-    int _cnt; 
-    long _flags; 
-    long _file; 
-    int _charbuf; 
-    int _bufsiz; 
-    char* _tmpfname; 
-    //CRITICAL_SECTION _lock; 
-} TWinSdk10File; 
- 
-enum EWinSdk10ModeBits { 
-    WIN_SDK10_IOREAD = 0x0001, 
-    WIN_SDK10_IOWRITE = 0x0002, 
-    WIN_SDK10_IOUPDATE = 0x0004, 
-    WIN_SDK10_IOEOF = 0x0008, 
-    WIN_SDK10_IOERROR = 0x0010, 
-    WIN_SDK10_IOCTRLZ = 0x0020, 
-    WIN_SDK10_IOBUFFER_CRT = 0x0040, 
-    WIN_SDK10_IOBUFFER_USER = 0x0080, 
-    WIN_SDK10_IOBUFFER_SETVBUF = 0x0100, 
-    WIN_SDK10_IOBUFFER_STBUF = 0x0200, 
-    WIN_SDK10_IOBUFFER_NONE = 0x0400, 
-    WIN_SDK10_IOCOMMIT = 0x0800, 
-    WIN_SDK10_IOSTRING = 0x1000, 
-    WIN_SDK10_IOALLOCATED = 0x2000, 
-}; 
-#endif 
- 
-#endif 
- 
+#pragma once
+
+#if defined(_MSC_VER)
+
+#include <ntverp.h>
+
+// Check for Windows SDK 10+
+#if defined(VER_PRODUCTBUILD) && VER_PRODUCTBUILD >= 9600
+#define WIN_SDK10 1
+#else
+#define WIN_SDK10 0
+#endif
+
+// Since Windows SDK 10 FILE is an internal opaque structure with no backward compatibility.
+// This code has been transplanted from Windows SDK
+// corecrt_internal_stdio.h
+
+// __crt_stdio_stream_data
+#if WIN_SDK10
+typedef struct {
+    union {
+        void* _public_file;
+        char* _ptr;
+    };
+
+    char* _base;
+    int _cnt;
+    long _flags;
+    long _file;
+    int _charbuf;
+    int _bufsiz;
+    char* _tmpfname;
+    //CRITICAL_SECTION _lock;
+} TWinSdk10File;
+
+enum EWinSdk10ModeBits {
+    WIN_SDK10_IOREAD = 0x0001,
+    WIN_SDK10_IOWRITE = 0x0002,
+    WIN_SDK10_IOUPDATE = 0x0004,
+    WIN_SDK10_IOEOF = 0x0008,
+    WIN_SDK10_IOERROR = 0x0010,
+    WIN_SDK10_IOCTRLZ = 0x0020,
+    WIN_SDK10_IOBUFFER_CRT = 0x0040,
+    WIN_SDK10_IOBUFFER_USER = 0x0080,
+    WIN_SDK10_IOBUFFER_SETVBUF = 0x0100,
+    WIN_SDK10_IOBUFFER_STBUF = 0x0200,
+    WIN_SDK10_IOBUFFER_NONE = 0x0400,
+    WIN_SDK10_IOCOMMIT = 0x0800,
+    WIN_SDK10_IOSTRING = 0x1000,
+    WIN_SDK10_IOALLOCATED = 0x2000,
+};
+#endif
+
+#endif
+