--- mem_align.c	2002/06/13 22:05:09	1.7
+++ mem_align.c	2002/10/19 11:41:11	1.10
@@ -3,6 +3,9 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Aligned memory allocator -
  *
+ *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
+ *               2002 Edouard Gomez
+ *
  *  This program is an implementation of a part of one or more MPEG-4
  *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
  *  to use this software module in hardware or software products are
@@ -26,18 +29,10 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- ****************************************************************************/
-/*****************************************************************************
- *
- *  History
- *
- *  - Thu Jun 13 23:50:07 2002 Added legal header
- *
- *  $Id: mem_align.c,v 1.7 2002/06/13 22:05:09 edgomez Exp $
+ * $Id: mem_align.c,v 1.10 2002/10/19 11:41:11 edgomez Exp $
  *
  ****************************************************************************/
 
-
 #include <stdlib.h>
 #include <stdio.h>
 #include "mem_align.h"
@@ -90,8 +85,8 @@
 
 			/* Align the tmp pointer */
 			mem_ptr =
-				(uint8_t *) ((uint32_t) (tmp + alignment - 1) &
-							 (~(uint32_t) (alignment - 1)));
+				(uint8_t *) ((ptr_t) (tmp + alignment - 1) &
+							 (~(ptr_t) (alignment - 1)));
 
 			/*
 			 * Special case where malloc have already satisfied the alignment