[Scummvm-cvs-logs] CVS: scummvm configure,1.21,1.22

Max Horn fingolfin at users.sourceforge.net
Mon Jun 2 04:21:04 CEST 2003


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv6483

Modified Files:
	configure 
Log Message:
working alignment check (but if alignment is needed it'll print out a 'Bus error' message which isn't nice...)

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure	2 Jun 2003 03:01:22 -0000	1.21
+++ configure	2 Jun 2003 11:20:07 -0000	1.22
@@ -307,13 +307,24 @@
 esac
 rm -f tmp_endianess_check tmp_endianess_check.cpp
 
-echo -n "Alignment required... "
+#
+# Check whether memory alignment is required
+#
+echo -n "Alignment required (don't worry if this shows a 'Bus error')... "
 cat > $TMPC << EOF
-#include <malloc.h>
-int main (void) { (void) memalign(64, sizeof(char)); return 0; }
+int main(int argc, char **argv)
+{
+	int i;
+	unsigned char buf[20];
+	for (i = 0; i < 16; i++)
+		*(int *)(&buf[i]) = 0;
+	return 0;
+}
 EOF
 _need_memalign=yes
-cc_check && _need_memalign=no
+# TODO: Hide the "Bus error" message, if possible...
+trap true BUS
+cc_check && ./$TMPO && _need_memalign=no
 if test "$_need_memalign" = yes ; then
   _def_align='#define SCUMM_NEED_ALIGNMENT'
 else





More information about the Scummvm-git-logs mailing list