Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 2 of 2.

1 files changed, 68 insertions, 68 deletions

diff --git a/contrib/tools/python3/src/Modules/socketmodule.h b/contrib/tools/python3/src/Modules/socketmodule.h
index 0d226300b8..ba2c9f5c31 100644
--- a/contrib/tools/python3/src/Modules/socketmodule.h
+++ b/contrib/tools/python3/src/Modules/socketmodule.h
@@ -14,47 +14,47 @@
 
 #else /* MS_WINDOWS */
 # include <winsock2.h>
- 
-/* 
- * If Windows has bluetooth support, include bluetooth constants. 
- */ 
-#ifdef AF_BTH 
-# include <ws2bth.h> 
-# include <pshpack1.h> 
- 
-/* 
- * The current implementation assumes the bdaddr in the sockaddr structs 
- * will be a bdaddr_t. We treat this as an opaque type: on *nix systems, it 
- * will be a struct with a single member (an array of six bytes). On windows, 
- * we typedef this to ULONGLONG to match the Windows definition. 
- */ 
-typedef ULONGLONG bdaddr_t; 
- 
-/* 
- * Redefine SOCKADDR_BTH to provide names compatible with _BT_RC_MEMB() macros. 
- */ 
-struct SOCKADDR_BTH_REDEF { 
-    union { 
-        USHORT    addressFamily; 
-        USHORT    family; 
-    }; 
- 
-    union { 
-        ULONGLONG btAddr; 
-        bdaddr_t  bdaddr; 
-    }; 
- 
-    GUID      serviceClassId; 
- 
-    union { 
-        ULONG     port; 
-        ULONG     channel; 
-    }; 
- 
-}; 
-# include <poppack.h> 
-#endif 
- 
+
+/*
+ * If Windows has bluetooth support, include bluetooth constants.
+ */
+#ifdef AF_BTH
+# include <ws2bth.h>
+# include <pshpack1.h>
+
+/*
+ * The current implementation assumes the bdaddr in the sockaddr structs
+ * will be a bdaddr_t. We treat this as an opaque type: on *nix systems, it
+ * will be a struct with a single member (an array of six bytes). On windows,
+ * we typedef this to ULONGLONG to match the Windows definition.
+ */
+typedef ULONGLONG bdaddr_t;
+
+/*
+ * Redefine SOCKADDR_BTH to provide names compatible with _BT_RC_MEMB() macros.
+ */
+struct SOCKADDR_BTH_REDEF {
+    union {
+        USHORT    addressFamily;
+        USHORT    family;
+    };
+
+    union {
+        ULONGLONG btAddr;
+        bdaddr_t  bdaddr;
+    };
+
+    GUID      serviceClassId;
+
+    union {
+        ULONG     port;
+        ULONG     channel;
+    };
+
+};
+# include <poppack.h>
+#endif
+
 /* Windows 'supports' CMSG_LEN, but does not follow the POSIX standard
  * interface at all, so there is no point including the code that
  * attempts to use it.
@@ -95,15 +95,15 @@ typedef int socklen_t;
 #  undef AF_NETLINK
 #endif
 
-#ifdef HAVE_LINUX_QRTR_H 
-# ifdef HAVE_ASM_TYPES_H 
-#  include <asm/types.h> 
-# endif 
-# include <linux/qrtr.h> 
-#else 
-#  undef AF_QIPCRTR 
-#endif 
- 
+#ifdef HAVE_LINUX_QRTR_H
+# ifdef HAVE_ASM_TYPES_H
+#  include <asm/types.h>
+# endif
+# include <linux/qrtr.h>
+#else
+#  undef AF_QIPCRTR
+#endif
+
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/rfcomm.h>
@@ -144,10 +144,10 @@ typedef int socklen_t;
 #include <linux/can/bcm.h>
 #endif
 
-#ifdef HAVE_LINUX_CAN_J1939_H 
-#include <linux/can/j1939.h> 
-#endif 
- 
+#ifdef HAVE_LINUX_CAN_J1939_H
+#include <linux/can/j1939.h>
+#endif
+
 #ifdef HAVE_SYS_SYS_DOMAIN_H
 #include <sys/sys_domain.h>
 #endif
@@ -239,18 +239,18 @@ typedef union sock_addr {
     struct sockaddr_in6 in6;
     struct sockaddr_storage storage;
 #endif
-#if defined(HAVE_BLUETOOTH_H) && defined(__FreeBSD__) 
-    struct sockaddr_l2cap bt_l2; 
-    struct sockaddr_rfcomm bt_rc; 
-    struct sockaddr_sco bt_sco; 
-    struct sockaddr_hci bt_hci; 
-#elif defined(HAVE_BLUETOOTH_BLUETOOTH_H) 
+#if defined(HAVE_BLUETOOTH_H) && defined(__FreeBSD__)
+    struct sockaddr_l2cap bt_l2;
+    struct sockaddr_rfcomm bt_rc;
+    struct sockaddr_sco bt_sco;
+    struct sockaddr_hci bt_hci;
+#elif defined(HAVE_BLUETOOTH_BLUETOOTH_H)
     struct sockaddr_l2 bt_l2;
     struct sockaddr_rc bt_rc;
     struct sockaddr_sco bt_sco;
     struct sockaddr_hci bt_hci;
-#elif defined(MS_WINDOWS) 
-    struct SOCKADDR_BTH_REDEF bt_rc; 
+#elif defined(MS_WINDOWS)
+    struct SOCKADDR_BTH_REDEF bt_rc;
 #endif
 #ifdef HAVE_NETPACKET_PACKET_H
     struct sockaddr_ll ll;
@@ -264,15 +264,15 @@ typedef union sock_addr {
 #ifdef HAVE_SOCKADDR_ALG
     struct sockaddr_alg alg;
 #endif
-#ifdef AF_QIPCRTR 
-    struct sockaddr_qrtr sq; 
-#endif 
+#ifdef AF_QIPCRTR
+    struct sockaddr_qrtr sq;
+#endif
 #ifdef AF_VSOCK
     struct sockaddr_vm vm;
 #endif
-#ifdef HAVE_LINUX_TIPC_H 
-    struct sockaddr_tipc tipc; 
-#endif 
+#ifdef HAVE_LINUX_TIPC_H
+    struct sockaddr_tipc tipc;
+#endif
 } sock_addr_t;
 
 /* The object holding a socket.  It holds some extra information,