diff --git a/armci/src/memory/shmem.c b/armci/src/memory/shmem.c index 66dbbff65..9e235a24f 100644 --- a/armci/src/memory/shmem.c +++ b/armci/src/memory/shmem.c @@ -828,10 +828,6 @@ char *Attach_Shared_Region(id, size, offset) { int reg, found, shmflag=0; static char *temp; - -#if defined(SGI_N32) && defined(SHM_SGI_ANYADDR) - shmflag= SHM_SGI_ANYADDR; -#endif if(alloc_regions>=MAX_REGIONS) armci_die("Attach_Shared_Region: to many regions ",0); @@ -921,10 +917,6 @@ int id,shmflag=0; size_t sz = (size_t)size; char *pref_addr = (char*)0; -#if defined(SGI_N32) && defined(SHM_SGI_ANYADDR) - shmflag= SHM_SGI_ANYADDR; -#endif - if(DEBUG1){ printf("%d:allocate: Shmem allocate size %ld bytes\n",armci_me,size); fflush(stdout); diff --git a/m4/ga_target.m4 b/m4/ga_target.m4 index a41dd37a6..e7c95310a 100644 --- a/m4/ga_target.m4 +++ b/m4/ga_target.m4 @@ -18,7 +18,6 @@ AH_TEMPLATE([FUJITSU_VPP], [Define to 1 on fujitsu systems]) AH_TEMPLATE([FUJITSU_VPP64],[Define to 1 on fujitsu systems]) AH_TEMPLATE([IBM], [Define to 1 on IBM SP systems]) AH_TEMPLATE([IBM64], [Define to 1 on 64bit IBM SP systems]) -AH_TEMPLATE([INTERIX], [Define to 1 on ??? systems]) AH_TEMPLATE([LINUX], [Define to 1 on generic Linux systems]) AH_TEMPLATE([LINUX64], [Define to 1 on generic 64bit Linux systems]) AH_TEMPLATE([MACX], [Define to 1 on OSX systems]) @@ -53,7 +52,7 @@ dnl AS_IF([test "x$ARMCI_TOP_BUILDDIR" != x], [ AC_CACHE_CHECK([whether we think this system is what we call SYSV], [ga_cv_sysv], [AS_CASE([$ga_cv_target_base], - [SUN|SOLARIS|IBM|LINUX|INTERIX|NEC], + [SUN|SOLARIS|IBM|LINUX|NEC], [ga_cv_sysv=yes], [ga_cv_sysv=no]) ]) @@ -67,7 +66,6 @@ AM_CONDITIONAL([CYGNUS], [test "$ga_cv_target_base" = CYGNUS]) AM_CONDITIONAL([CYGWIN], [test "$ga_cv_target_base" = CYGWIN]) AM_CONDITIONAL([FUJITSU_VPP], [test "$ga_cv_target_base" = FUJITSU_VPP]) AM_CONDITIONAL([IBM], [test "$ga_cv_target_base" = IBM]) -AM_CONDITIONAL([INTERIX], [test "$ga_cv_target_base" = INTERIX]) AM_CONDITIONAL([LINUX], [test "$ga_cv_target_base" = LINUX]) AM_CONDITIONAL([MACX], [test "$ga_cv_target_base" = MACX]) AM_CONDITIONAL([MINGW], [test "$ga_cv_target_base" = MINGW]) diff --git a/pario/elio/elio.c b/pario/elio/elio.c index 43d1c5068..1bff62ffe 100644 --- a/pario/elio/elio.c +++ b/pario/elio/elio.c @@ -42,7 +42,7 @@ #include "../sf/coms.h" -#if defined(AIX) || defined(SGI64) || defined(CRAY) || defined(LINUXAIO) +#if defined(AIX) || defined(CRAY) || defined(LINUXAIO) /* systems with Asynchronous I/O */ #else # ifndef NOAIO