From 85fe199795c91510ad495c04aea535705ad9abb5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 3 Aug 2012 19:54:08 +0000 Subject: Remove some pre-2.6.0 Linux kernel conditionals. --- sysdeps/unix/sysv/linux/shm_open.c | 8 ++------ 1 file changed, 2 insertions(+), 6 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 763b087466..82332a30e3 100644 --- a/sysdeps/unix/sysv/linux/shm_open.c +++ b/sysdeps/unix/sysv/linux/shm_open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2004,2006,2007 Free Software Foundation, Inc. +/* Copyright (C) 2000-2012 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 @@ -86,11 +86,7 @@ where_is_shmfs (void) while ((mp = __getmntent_r (fp, &resmem, buf, sizeof buf)) != NULL) /* The original name is "shm" but this got changed in early Linux 2.4.x to "tmpfs". */ - if (strcmp (mp->mnt_type, "tmpfs") == 0 -#ifndef __ASSUME_TMPFS_NAME - || strcmp (mp->mnt_type, "shm") == 0 -#endif - ) + if (strcmp (mp->mnt_type, "tmpfs") == 0) { /* Found it. There might be more than one place where the filesystem is mounted but one is enough for us. */ -- cgit v1.2.3