* include/ntsecapi.h: New file.

        * include/subauth.h: Ditto.
        * include/ipexport.h: Fix global header define not to contain
        trailing underscore. Change layout according to standard.
        * include/iphlpapi.h: Ditto.
        * include/ipifcons.h: Ditto.
        * include/iptypes.h: Ditto.
        * include/ntdef.h: Ditto. Define conditional datatypes dependent
        of inclusion of ntdecapi.h and subauth.h.
        * lib/secur32.def: New stub for secur32.dll.

1 files changed, 4 insertions, 16 deletions

diff --git a/winsup/w32api/include/iptypes.h b/winsup/w32api/include/iptypes.h
index 94fbb771d..83c5dd4e8 100644
--- a/winsup/w32api/include/iptypes.h
+++ b/winsup/w32api/include/iptypes.h
@@ -1,43 +1,34 @@
-#ifndef _IPTYPES_H_
-#define _IPTYPES_H_
-
+#ifndef _IPTYPES_H
+#define _IPTYPES_H
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 #define DEFAULT_MINIMUM_ENTITIES 32
-
 #define MAX_ADAPTER_ADDRESS_LENGTH 8
 #define MAX_ADAPTER_DESCRIPTION_LENGTH 128
 #define MAX_ADAPTER_NAME_LENGTH 256
 #define MAX_DOMAIN_NAME_LEN 128
 #define MAX_HOSTNAME_LEN 128
 #define MAX_SCOPE_ID_LEN 256
-
 #define BROADCAST_NODETYPE 1
 #define PEER_TO_PEER_NODETYPE 2
 #define MIXED_NODETYPE 4
 #define HYBRID_NODETYPE 8
-
 #define IF_OTHER_ADAPTERTYPE 0
 #define IF_ETHERNET_ADAPTERTYPE 1
 #define IF_TOKEN_RING_ADAPTERTYPE 2
 #define IF_FDDI_ADAPTERTYPE 3
 #define IF_PPP_ADAPTERTYPE 4
 #define IF_LOOPBACK_ADAPTERTYPE 5
-
 typedef struct {
   char String[4 * 4];
-} IP_ADDRESS_STRING, *PIP_ADDRESS_STRING,
-  IP_MASK_STRING, *PIP_MASK_STRING;
-
+} IP_ADDRESS_STRING, *PIP_ADDRESS_STRING, IP_MASK_STRING, *PIP_MASK_STRING;
 typedef struct __IP_ADDR_STRING {
   struct __IP_ADDR_STRING* Next;
   IP_ADDRESS_STRING IpAddress;
   IP_MASK_STRING IpMask;
   DWORD Context;
 } IP_ADDR_STRING, *PIP_ADDR_STRING;
-
 typedef struct __IP_ADAPTER_INFO {
   struct __IP_ADAPTER_INFO* Next;
   DWORD ComboIndex;
@@ -58,7 +49,6 @@ typedef struct __IP_ADAPTER_INFO {
   time_t LeaseObtained;
   time_t LeaseExpires;
 } IP_ADAPTER_INFO, *PIP_ADAPTER_INFO;
-
 typedef struct {
   char HostName[MAX_HOSTNAME_LEN + 4] ;
   char DomainName[MAX_DOMAIN_NAME_LEN + 4];
@@ -70,9 +60,7 @@ typedef struct {
   UINT EnableProxy;
   UINT EnableDns;
 } FIXED_INFO, *PFIXED_INFO;
-
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _IPTYPES_H_ */
+#endif /* _IPTYPES_H */