diff options
| author | unknown <Kristofer.Pettersson@naruto.> | 2007-03-02 09:04:23 +0100 |
|---|---|---|
| committer | unknown <Kristofer.Pettersson@naruto.> | 2007-03-02 09:04:23 +0100 |
| commit | 198a8abd87e787c8dd9e92eedadd59b03dba257c (patch) | |
| tree | 291a37ce797e24ec3a5c52d6e6826ef5c1f64089 /server-tools | |
| parent | 7be25714a7255b8e1eddcd3867032c8416e26462 (diff) | |
| download | mariadb-git-198a8abd87e787c8dd9e92eedadd59b03dba257c.tar.gz | |
Merge BUG: Windows target won't compile.
- winsock2.h must be included before windows.h
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/WindowsService.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server-tools/instance-manager/WindowsService.cpp b/server-tools/instance-manager/WindowsService.cpp index 7c5641167e4..14795e2225a 100644 --- a/server-tools/instance-manager/WindowsService.cpp +++ b/server-tools/instance-manager/WindowsService.cpp @@ -13,9 +13,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <windows.h> - #include "my_global.h" +#include <windows.h> #include "WindowsService.h" static WindowsService *gService; |