Chromium Code Reviews| Index: chrome/installer/mini_installer/mini_installer.cc |
| =================================================================== |
| --- chrome/installer/mini_installer/mini_installer.cc (revision 78148) |
| +++ chrome/installer/mini_installer/mini_installer.cc (working copy) |
| @@ -28,6 +28,9 @@ |
| // having the linker merge the sections is saving us ~500 bytes. |
| #pragma comment(linker, "/MERGE:.rdata=.text") |
| +#ifdef COMPILER_MSVCEXPRESS |
| +#include <intrin.h> // __stosb for memset |
|
Mark Mentovai
2011/03/16 16:25:20
Two spaces before the //, one after.
M-A Ruel
2011/03/16 17:48:55
Just include it, no need for #ifdef.
RN
2011/03/17 06:33:25
Done and Done.
|
| +#endif |
| #include <windows.h> |
| #include <setupapi.h> |
| #include <shellapi.h> |
| @@ -704,3 +707,15 @@ |
| int result = mini_installer::WMain(::GetModuleHandle(NULL)); |
| ::ExitProcess(result); |
| } |
| + |
| +// VC Express editions don't come with the memset CRT obj file |
| +#ifdef COMPILER_MSVCEXPRESS |
| + extern "C" { |
|
Mark Mentovai
2011/03/16 16:25:20
Don’t indent this line at all.
RN
2011/03/17 06:33:25
Done.
|
| + #pragma function(memset) |
|
Mark Mentovai
2011/03/16 16:25:20
Never indent C preprocessor directives.
RN
2011/03/17 06:33:25
Done.
|
| + void* memset(void *dest, int ci, size_t count) { |
|
Mark Mentovai
2011/03/16 16:25:20
The indentation in here is wrong, too.
RN
2011/03/17 06:33:25
Think I fixed this.
|
| + __stosb((unsigned char*)dest, (unsigned char)ci, count); |
| + return dest; |
| + } |
| + } |
| +#endif |
| + |
|
Mark Mentovai
2011/03/16 16:25:20
Get rid of the blank line at EOF.
RN
2011/03/17 06:33:25
Done.
|