Verified Commit cff32b0c authored by Thomas Ives's avatar Thomas Ives
Browse files

treewide: Do not allow clang-format to sort winsock2

parent 4f8dee3c

log4tango/include/tango/common/log4tango/Portability.h

+2 −0
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 


  // We ensure that the header is included because we will redefine the ERROR and DEBUG

  // macros. Also includes winsock2 to prevent windows.h from including 'winsock.h'.

  // clang-format off

  #include <winsock2.h>

  #include <windows.h>

  // clang-format on



  /* define to get around problems with ERROR in windows.h */

  #ifndef LOG4TANGO_FIX_ERROR_COLLISION

src/include/tango/windows/coutbuf.h

+2 −0
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ 
#ifndef TANGO_WINDOWS_COUTBUF_H

#define TANGO_WINDOWS_COUTBUF_H



// clang-format off

#include <winsock2.h> // prevents windows.h from including winsock.h

#include <windows.h>

// clang-format on



namespace Tango

{

src/include/tango/windows/ntservice.h

+4 −1
Original line number Diff line number Diff line
@@ -7,9 +7,12 @@ 
#ifndef TANGO_WINDOWS_NTSERVICE_H

#define TANGO_WINDOWS_NTSERVICE_H



#include <string>

// clang-format off

#include <winsock2.h> // prevents windows.h from including winsock.h

#include <windows.h>

// clang-format on



#include <string>



namespace Tango

{

src/include/tango/windows/w32win.h

+2 −0
Original line number Diff line number Diff line
@@ -9,8 +9,10 @@ 


#include <tango/common/tango_const.h>



// clang-format off

#include <winsock2.h> // prevents windows.h from including winsock.h

#include <windows.h>

// clang-format on



namespace Tango

{