util: fixed building on mingw32

4 files changed, 34 insertions, 3 deletions

diff --git a/util/src/Makefile.am b/util/src/Makefile.am
index 11714b6..fb40027 100644
--- a/util/src/Makefile.am
+++ b/util/src/Makefile.am
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-SUBDIRS = platforms/unix @ZLIBBUILD@
+SUBDIRS = $(PLATFORM_SUB) @ZLIBBUILD@
 lib_LTLIBRARIES = libaxutil.la
 libaxutil_la_SOURCES = hash.c \
                         allocator.c \
@@ -54,7 +54,7 @@ libaxutil_la_SOURCES = hash.c \
 			http_chunked_stream.c \
                         digest_calc.c 
                         
-libaxutil_la_LIBADD =	$(top_builddir)/src/platforms/unix/libaxis2_unix.la \
+libaxutil_la_LIBADD =	$(top_builddir)/src/platforms/$(PLATFORM)/libaxis2_$(PLATFORM).la \
 			-lpthread \
 			@ZLIBLIBS@
 
diff --git a/util/src/platforms/unix/Makefile.am b/util/src/platforms/unix/Makefile.am
index 2f1496c..a7ccc73 100644
--- a/util/src/platforms/unix/Makefile.am
+++ b/util/src/platforms/unix/Makefile.am
@@ -12,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+if !HOST_OS_MINGW
 noinst_LTLIBRARIES = libaxis2_unix.la
 
 libaxis2_unix_la_SOURCES = uuid_gen_unix.c\
@@ -20,3 +21,4 @@ libaxis2_unix_la_SOURCES = uuid_gen_unix.c\
 INCLUDES = -I$(top_builddir)/include \
            -I$(top_builddir)/include/platforms \
            -I$(top_builddir)/include/platforms/unix
+endif
diff --git a/util/src/platforms/windows/Makefile.am b/util/src/platforms/windows/Makefile.am
new file mode 100644
index 0000000..c0230d2
--- /dev/null
+++ b/util/src/platforms/windows/Makefile.am
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+if HOST_OS_MINGW
+noinst_LTLIBRARIES = libaxis2_windows.la
+
+libaxis2_windows_la_SOURCES = axutil_windows.c uuid_gen_windows.c\
+                           date_time_util_windows.c dir_windows.c\
+                           getopt_windows.c\
+                           thread_windows.c thread_mutex_windows.c
+libaxis2_windows_la_LIBADD = -lws2_32 -lrpcrt4
+
+INCLUDES = -I$(top_builddir)/include \
+           -I$(top_builddir)/include/platforms \
+           -I$(top_builddir)/include/platforms/windows
+endif
diff --git a/util/src/platforms/windows/axutil_windows.c b/util/src/platforms/windows/axutil_windows.c
index 5e37abb..add6cc2 100644
--- a/util/src/platforms/windows/axutil_windows.c
+++ b/util/src/platforms/windows/axutil_windows.c
@@ -17,7 +17,9 @@
 
 #include <windows/axutil_windows.h>
 #include <stdio.h>
-
+#ifdef __MINGW32__
+#include <stdint.h>
+#endif
 
 /*