* include/malloc.h (__mingw_aligned_offset_malloc,

	__mingw_aligned_offset_realloc, __mingw_aligned_malloc,
	__mingw_aligned_realloc, __mingw_aligned_free): Add
	prototypes.
	* mingwex/Makefile.in (DISTFILES): Add mingw-aligned-malloc.c,
	tst-aligned-malloc.c.
	(REPLACE_OBJS): Add mingw-aligned-malloc.o.

3 files changed, 26 insertions, 7 deletions

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index d1b9bf6..449f185 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-24  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/malloc.h (__mingw_aligned_offset_malloc,
+	__mingw_aligned_offset_realloc, __mingw_aligned_malloc,
+	__mingw_aligned_realloc, __mingw_aligned_free): Add
+	prototypes.
+	* mingwex/Makefile.in (DISTFILES): Add mingw-aligned-malloc.c,
+	tst-aligned-malloc.c.
+	(REPLACE_OBJS): Add mingw-aligned-malloc.o.
+
 2004-08-24  Steven G. Johnson  <stevenj@alum.mit.edu>
 
 	* mingwex/mingw-aligned-malloc.c: New file.
diff --git a/winsup/mingw/include/malloc.h b/winsup/mingw/include/malloc.h
index 3cfc5fb..dac7ee4 100644
--- a/winsup/mingw/include/malloc.h
+++ b/winsup/mingw/include/malloc.h
@@ -68,11 +68,19 @@ _CRTIMP void* __cdecl _expand (void*, size_t);
 _CRTIMP void * __cdecl _aligned_offset_malloc(size_t, size_t, size_t);
 _CRTIMP void * __cdecl _aligned_offset_realloc(void*, size_t, size_t, size_t);
 
-_CRTIMP void* __cdecl _aligned_malloc (size_t, size_t);
-_CRTIMP void* __cdecl _aligned_realloc (void*, size_t, size_t);
+_CRTIMP void * __cdecl _aligned_malloc (size_t, size_t);
+_CRTIMP void * __cdecl _aligned_realloc (void*, size_t, size_t);
 _CRTIMP void __cdecl _aligned_free (void*);
 #endif /* __MSVCRT_VERSION__ >= 0x0700 */
 
+/* These require libmingwex.a. */ 
+void * __cdecl __mingw_aligned_offset_malloc (size_t, size_t, size_t);
+void * __cdecl __mingw_aligned_offset_realloc (void*, size_t, size_t, size_t);
+
+void * __cdecl __mingw_aligned_malloc (size_t, size_t);
+void * __cdecl __mingw_aligned_realloc (void*, size_t, size_t);
+void __cdecl __mingw_aligned_free (void*);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in
index 8aa04f5..c17d9ba 100644
--- a/winsup/mingw/mingwex/Makefile.in
+++ b/winsup/mingw/mingwex/Makefile.in
@@ -30,10 +30,11 @@ DISTFILES = Makefile.in configure configure.in \
 	fegetexceptflag.c fegetround.c feholdexcept.c feraiseexcept.c \
 	fesetenv.c fesetexceptflag.c fesetround.c fetestexcept.c \
 	feupdateenv.c ftruncate.c fwide.c  getopt.c imaxabs.c imaxdiv.c \
-	ldtoa.c lltoa.c lltow.c mbsinit.c mingw-fseek.c sitest.c strtof.c \
-	strtoimax.c strtold.c strtoumax.c testwmem.c ulltoa.c ulltow.c \
-	wcstof.c wcstoimax.c wcstold.c wcstoumax.c wdirent.c wmemchr.c \
-	wmemcmp.c wmemcpy.c wmemmove.c wmemset.c wtoll.c
+	ldtoa.c lltoa.c lltow.c mbsinit.c mingw-aligned-malloc.o \
+	mingw-fseek.c sitest.c strtof.c strtoimax.c strtold.c strtoumax.c \
+	testwmem.c tst-aligned-malloc.c ulltoa.c ulltow.c wcstof.c \
+	wcstoimax.c wcstold.c wcstoumax.c wdirent.c wmemchr.c wmemcmp.c \
+	wmemcpy.c wmemmove.c wmemset.c wtoll.c
 	
 MATH_DISTFILES = \
 	acosf.c acosl.c asinf.c asinl.c atan2f.c atan2l.c \
@@ -149,7 +150,7 @@ FENV_OBJS = fesetround.o  fegetround.o \
 POSIX_OBJS = \
 	dirent.o wdirent.o getopt.o ftruncate.o
 REPLACE_OBJS = \
-	mingw-fseek.o
+	mingw-aligned-malloc.o mingw-fseek.o
 COMPLEX_OBJS = \
 	cabs.o cacos.o cacosh.o carg.o casin.o casinh.o catan.o catanh.o \
 	ccos.o ccosh.o cexp.o cimag.o clog.o cpow.o cproj.o creal.o \