Roll src/third_party/WebKit e353f22:4d062fa (svn 200353:200356)
[chromium-blink-merge.git] / third_party / yasm / CHROMIUM.diff
blob764cbf738b85ce36f46f36d33aaf021feca7f0ee
1 --- frontends/tasm/tasm.c
2 +++ frontends/tasm/tasm.c
3 @@ -224,7 +224,9 @@
4 /* version message */
5 /*@observer@*/ static const char *version_msg[] = {
6 PACKAGE_STRING,
7 +#if !defined(DONT_EMBED_BUILD_METADATA) || defined(OFFICIAL_BUILD)
8 "Compiled on " __DATE__ ".",
9 +#endif
10 "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.",
11 "Run yasm --license for licensing overview and summary."
13 --- frontends/yasm/yasm.c
14 +++ frontends/yasm/yasm.c
15 @@ -213,7 +213,9 @@
16 /* version message */
17 /*@observer@*/ static const char *version_msg[] = {
18 PACKAGE_STRING,
19 +#if !defined(DONT_EMBED_BUILD_METADATA) || defined(OFFICIAL_BUILD)
20 "Compiled on " __DATE__ ".",
21 +#endif
22 "Copyright (c) 2001-2011 Peter Johnson and other Yasm developers.",
23 "Run yasm --license for licensing overview and summary."