From 3e543bc56346540cbf73fd48d0172fc6a588efd5 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 30 Jan 2006 09:30:09 +0000 Subject: Updated to fedora-glibc-20060130T0922 --- sysdeps/unix/sysv/linux/shm_open.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/shm_open.c') diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c index 2e94b76cdb..0d40632e5f 100644 --- a/sysdeps/unix/sysv/linux/shm_open.c +++ b/sysdeps/unix/sysv/linux/shm_open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2000,2001,2002,2003,2004,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,6 +29,8 @@ #include #include "linux_fsinfo.h" +#include + /* Mount point of the shared memory filesystem. */ static struct @@ -81,7 +83,10 @@ where_is_shmfs (void) /* The original name is "shm" but this got changed in early Linux 2.4.x to "tmpfs". */ if (strcmp (mp->mnt_type, "tmpfs") == 0 - || strcmp (mp->mnt_type, "shm") == 0) +#ifndef __ASSUME_TMPFS_NAME + || strcmp (mp->mnt_type, "shm") == 0 +#endif + ) { /* Found it. There might be more than one place where the filesystem is mounted but one is enough for us. */ -- cgit v1.2.3-70-g09d2