Sfoglia il codice sorgente

Z991239-890 #comment 处理在linux 编译 mod_bootmanager 失败的问题

80374374 5 anni fa
parent
commit
2585c93b02
2 ha cambiato i file con 9 aggiunte e 5 eliminazioni
  1. 8 5
      .gitattributes
  2. 1 0
      Module/mod_BootManager/mod_BootManager.h

+ 8 - 5
.gitattributes

@@ -29,6 +29,7 @@
 *.csproj    text eol=crlf
 #*.vbproj    merge=binary
 *.vcxproj   text eol=crlf
+*.vcxproj.filters text eol=crlf
 *.vcproj    text eol=crlf
 *.filters   text eol=crlf
 #*.dbproj    merge=binary
@@ -42,10 +43,12 @@
 *.cmd        text eol=crlf
 *.bat        text eol=crlf
 *.props      text eol=crlf
-*.sh text eol=lf
-*.pbxproj text eol=lf
+
+
+*.sh         text eol=lf
+*.pbxproj    text eol=lf
 *.storyboard text eol=lf
-*.plist text eol=lf
+*.plist      text eol=lf
 
 ###############################################################################
 # behavior for image files
@@ -55,8 +58,8 @@
 *.jpg   binary
 *.png   binary
 *.gif   binary
-*.ttf binary
-*.lib binary
+*.ttf   binary
+*.lib   binary
 
 ###############################################################################
 # diff behavior for common document formats

+ 1 - 0
Module/mod_BootManager/mod_BootManager.h

@@ -6,6 +6,7 @@
 #include "modVer.h"
 
 #include <vector>
+#include <memory>
 
 #define ISSUCCEEDED(hr) ((hr) == Error_Succeed)
 #define FAILURED(hr) (!(ISSUCCEEDED(hr)))