<!DOCTYPE html>
<html>
  <head>
  </head>
  <body>
    <dl style="line-height: 1.5; margin-left: 2em">
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
      <dd style="margin-left: 8.5em">Kouhei Sutou &lt;kou****@clear*****&gt;</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
      <dd style="margin-left: 8.5em">2015-08-31 17:17:47 +0900 (Mon, 31 Aug 2015)</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
      <dd style="margin-left: 8.5em"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53">85b159bc09fd478fe9dffefbdc77d333748d3b53</a></dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
      <dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">source windows: backport disabling WIN32_LEAN_AND_MEAN patch

It causes build error on MariaDB bundled build on Windows.</pre></dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Added files</dt>
      <dd style="margin-left: 8.5em">
        <ul>
          <li><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9a">packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff</a></li>
        </ul>
      </dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
      <dd style="margin-left: 8.5em">
        <ul>
          <li><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27">packages/source/Makefile.am</a></li>
        </ul>
      </dd>
    </dl>

    <div class="diff-section" style="clear: both">
      <table style="border-collapse: collapse; border: 1px solid #aaa">
        <thead>
          <tr class="diff-header" style="border: 1px solid #aaa">
            <td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">  Modified: packages/source/Makefile.am (+3 -2)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
            </td>
          </tr>
        </thead>
        <tbody>
          <tr>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L102">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L103">103</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L104">104</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L105">105</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L106">106</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L107">107</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L108">108</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L109">109</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27L110">110</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R102">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R103">103</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R104">104</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R105">105</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R106">106</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R107">107</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R108">108</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R109">109</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R110">110</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-c1ba90d3d54a5531ff93c92e31f7cd27R111">111</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -103,8 +103,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">files/$(MARIADB_WITH_MROONGA_BASE).tar.gz: tmp/$(MARIADB_WITH_MROONGA_BASE).stam</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">         mkdir -p files/</span>
<span class="diff-not-changed" style="display: block; white-space: pre">         (cd tmp &amp;&amp; tar czf ../$@ $(MARIADB_WITH_MROONGA_BASE))</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-PATCHES =                                                \</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-        patches/mariadb-10.0.3-windows-build.diff</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+PATCHES =                                                                \</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+        patches/mariadb-10.0.3-windows-build.diff                        \</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+        patches/groonga-5.0.7-windows-mariadb-bundled-build.diff</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> tmp/$(MARIADB_WITH_MROONGA_FOR_WINDOWS_BASE).stamp: tmp/$(MARIADB_WITH_MROONGA_BASE).stamp $(PATCHES)</span>
<span class="diff-not-changed" style="display: block; white-space: pre">         rm -rf tmp/$(MARIADB_WITH_MROONGA_FOR_WINDOWS_BASE)</span>
</pre>
            </td>
          </tr>
        </tbody>
      </table>
      <table style="border-collapse: collapse; border: 1px solid #aaa">
        <thead>
          <tr class="diff-header" style="border: 1px solid #aaa">
            <td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">  Added: packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff (+14 -0) 100644</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
            </td>
          </tr>
        </thead>
        <tbody>
          <tr>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9a">...</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9a">...</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR1">1</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR2">2</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR3">3</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR4">4</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR5">5</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR6">6</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR7">7</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR8">8</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR9">9</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR10">10</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR11">11</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR12">12</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR13">13</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/85b159bc09fd478fe9dffefbdc77d333748d3b53#diff-6c65c588bb140d06e234a45ae4f6db9aR14">14</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -0,0 +1,14 @@</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+diff -ru mariadb-10.0.21-with-mroonga-5.06.orig/storage/mroonga/vendor/groonga/lib/grn.h mariadb-10.0.21-with-mroonga-5.06/storage/mroonga/vendor/groonga/lib/grn.h</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+--- mariadb-10.0.21-with-mroonga-5.06.orig/storage/mroonga/vendor/groonga/lib/grn.h        2015-08-13 18:15:38.000000000 +0900</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">++++ mariadb-10.0.21-with-mroonga-5.06/storage/mroonga/vendor/groonga/lib/grn.h        2015-08-31 17:13:59.251028024 +0900</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+@@ -47,6 +47,10 @@</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ #  undef NTDDI_VERSION</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ # endif /* NTDDI_VERSION */</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ # define NTDDI_VERSION GRN_MINIMUM_WINDOWS_VERSION</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">++</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">++# ifdef WIN32_LEAN_AND_MEAN</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">++#  undef WIN32_LEAN_AND_MEAN</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">++# endif /* WIN32_LEAN_AND_MEAN */</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ #endif /* WIN32 */</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ </span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ #ifdef __cplusplus</span>
</pre>
            </td>
          </tr>
        </tbody>
      </table>
    </div>
  </body>
</html>