Implement ticket #103: changed autoconf script to use native Win32 file I/O on mingw and cygwin

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@951 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 4 insertions, 6 deletions

diff --git a/aconfigure b/aconfigure
index 3ddb9f02..ff2d7d2e 100755
--- a/aconfigure
+++ b/aconfigure
@@ -8349,10 +8349,10 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 case $target in
   *mingw* | *cygw* | *win32* | *w32* )
-	ac_os_objs="os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o ioqueue_select.o"
+	ac_os_objs="file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o ioqueue_select.o"
 	;;
   *)
-	ac_os_objs="os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o ioqueue_select.o"
+	ac_os_objs="file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o ioqueue_select.o"
 	;;
 esac
 
diff --git a/aconfigure.ac b/aconfigure.ac
index f94dcd73..d729c963 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -223,10 +223,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
 AC_SUBST(ac_os_objs)
 case $target in
   *mingw* | *cygw* | *win32* | *w32* )
-	ac_os_objs="os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o ioqueue_select.o"
+	ac_os_objs="file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o ioqueue_select.o"
 	;;
   *)
-	ac_os_objs="os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o ioqueue_select.o"
+	ac_os_objs="file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o ioqueue_select.o"
 	;;
 esac
 
diff --git a/pjlib/build/os-auto.mak.in b/pjlib/build/os-auto.mak.in
index e4bfe62b..a4a2b8aa 100644
--- a/pjlib/build/os-auto.mak.in
+++ b/pjlib/build/os-auto.mak.in
@@ -14,8 +14,6 @@ export PJLIB_OBJS +=	$(AC_OS_OBJS) \
 			os_timestamp_common.o \
 			pool_policy_malloc.o sock_bsd.o sock_select.o
 
-export PJLIB_OBJS += file_access_unistd.o file_io_ansi.o
-
 #
 # TEST_OBJS are operating system specific object files to be included in
 # the test application.