Skip to content

Commit 569403f

Browse files
committed
Minor changes
1 parent 185cb03 commit 569403f

4 files changed

Lines changed: 10 additions & 11 deletions

File tree

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ IndentWidth: 4
1212
TabWidth: 4
1313
ContinuationIndentWidth: 4
1414
ColumnLimit: 0
15-
LineEnding: DeriveLF
15+
LineEnding: CRLF
1616
InsertNewlineAtEOF: false
1717

1818
NamespaceIndentation: All

.editorconfig

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ end_of_line = crlf
77
insert_final_newline = true
88
trim_trailing_whitespace = true
99

10-
[*.asm]
11-
indent_style = tab
12-
indent_size = 4
13-
tab_width = 4
10+
[*.md]
11+
trim_trailing_whitespace = false
1412

15-
[*.{c,cc,cxx,cpp,h,hpp,hxx,inl,ipp,ixx,tlh,tli}]
13+
[*.{asm,c,cc,cxx,cpp,h,hpp,hxx,inl,ipp,ixx,tlh,tli}]
1614
indent_style = tab
1715
indent_size = 4
1816
tab_width = 4

.gitattributes

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
###############################################################################
2-
# Set default behavior to automatically normalize line endings.
2+
# Set default behavior to automatically normalize text files and check them
3+
# out with CRLF line endings.
34
###############################################################################
4-
* text=auto
5+
* text=auto eol=crlf
56

67
###############################################################################
78
# Set default behavior for command prompt diff.

Detours.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8089,7 +8089,7 @@ namespace Detours {
80898089
unsigned int m_unRTM : 1; // Bit 15: Restricted Transactional Memory
80908090
unsigned int : 16; // Bit 16-31: Reserved
80918091
#ifdef _M_X64
8092-
unsigned int : 32; // Bit 32-63: Reserved (x64 upper bits)
8092+
unsigned int : 32; // Bit 32-63: Reserved (x64 upper bits)
80938093
#endif
80948094
};
80958095

@@ -8116,7 +8116,7 @@ namespace Detours {
81168116
unsigned int m_unRW3 : 2; // Bit 28-29: Breakpoint 3 condition
81178117
unsigned int m_unLEN3 : 2; // Bit 30-31: Breakpoint 3 length
81188118
#ifdef _M_X64
8119-
unsigned int : 32; // Bit 32-63: Reserved
8119+
unsigned int : 32; // Bit 32-63: Reserved
81208120
#endif
81218121
};
81228122

@@ -8144,7 +8144,7 @@ namespace Detours {
81448144
unsigned int m_unID : 1; // Bit 21: ID Flag
81458145
unsigned int : 10; // Bit 22-31: Reserved
81468146
#ifdef _M_X64
8147-
unsigned int : 32; // Bit 32-63: Reserved
8147+
unsigned int : 32; // Bit 32-63: Reserved
81488148
#endif
81498149
};
81508150

0 commit comments

Comments
 (0)