Merge branch 'master' into gui

This commit is contained in:
Joel Holdsworth 2009-01-06 17:15:10 +00:00
commit 89ce4c94f0
2 changed files with 4 additions and 2 deletions

View file

@ -124,7 +124,7 @@ AC_CHECK_HEADER([boost/regex.hpp],
AC_LANG_POP([C++]) AC_LANG_POP([C++])
PKG_CHECK_MODULES(LUMIERA_COMMON_LIBS, [sigc++-2.0 >= 2.0.18]) PKG_CHECK_MODULES(LUMIERA_COMMON_LIBS, [sigc++-2.0 >= 2.0.17])
############## Internatinalization ############## Internatinalization
#GETTEXT_PACKAGE=gtk-lumiera #GETTEXT_PACKAGE=gtk-lumiera

View file

@ -48,7 +48,9 @@ TEST ("mmap_semantic")
int fd = open (",mmaptest", O_RDWR|O_CREAT, 0666); int fd = open (",mmaptest", O_RDWR|O_CREAT, 0666);
printf ("got fd %d\n", fd); printf ("got fd %d\n", fd);
printf ("error %s\n", strerror (errno)); printf ("error %s\n", strerror (errno));
ftruncate (fd, 8192); int dummy = ftruncate (fd, 8192);
(void)dummy;
TODO ("handle error case better");
void* addr = mmap (NULL, void* addr = mmap (NULL,
8192, 8192,