diff options
| author | Kristofer.Pettersson@naruto. <> | 2007-03-02 09:04:23 +0100 |
|---|---|---|
| committer | Kristofer.Pettersson@naruto. <> | 2007-03-02 09:04:23 +0100 |
| commit | cba58e5910de1c31ccc0f99210688a4ef3228a8f (patch) | |
| tree | 291a37ce797e24ec3a5c52d6e6826ef5c1f64089 /server-tools | |
| parent | 6cf49ef0651bb50276fd1fa7bcc52a7e03445c76 (diff) | |
| download | mariadb-git-cba58e5910de1c31ccc0f99210688a4ef3228a8f.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; |