Bug 1422852 - remove D_INO setting from configure; r=chmanchester
authorNathan Froyd <froydnj@mozilla.com>
Mon, 04 Dec 2017 08:18:00 -0500
changeset 447922 bb8056c405856f8ec9459956cd01428891a5b407
parent 447921 e66e48637c6578350a43e157988b2a9787a3ab4a
child 447923 dbe0c741aa32a9847ac6ad4cf5ebe1bfc93f32dc
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1422852
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1422852 - remove D_INO setting from configure; r=chmanchester We only had this "for flexibility with other platforms", but given that we set it to the same thing for all platforms, and nobody has tried to change that, this flexibility isn't actually needed.
config/pathsub.c
js/src/old-configure.in
old-configure.in
--- a/config/pathsub.c
+++ b/config/pathsub.c
@@ -22,20 +22,16 @@
 #ifdef USE_REENTRANT_LIBC
 #include <libc_r.h>
 #endif
 
 #ifdef SUNOS4
 #include "sunos4.h"
 #endif
 
-#ifndef D_INO
-#define D_INO	d_ino
-#endif
-
 char *program;
 
 void
 fail(const char *format, ...)
 {
     int error;
     va_list ap;
 
@@ -103,17 +99,17 @@ ino2name(ino_t ino)
     char *name;
 
     dp = opendir("..");
     if (!dp)
 	fail("cannot read parent directory");
     for (;;) {
 	if (!(ep = readdir(dp)))
 	    fail("cannot find current directory");
-	if (ep->D_INO == ino)
+	if (ep->d_ino == ino)
 	    break;
     }
     name = xstrdup(ep->d_name);
     closedir(dp);
     return name;
 }
 
 void *
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -407,17 +407,16 @@ AC_SUBST(MOZJS_ALPHA)
 
 dnl ========================================================
 dnl set the defaults first
 dnl ========================================================
 AS_BIN=$AS
 AR_EXTRACT='$(AR) x'
 AS='$(CC)'
 AS_DASH_C_FLAG='-c'
-DIRENT_INO=d_ino
 MOZ_USER_DIR=".mozilla"
 
 MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
 
 dnl Configure platform-specific CPU architecture compiler options.
 dnl ==============================================================
 MOZ_ARCH_OPTS
 
@@ -878,20 +877,16 @@ case "$target" in
     ;;
 
 esac
 
 if test -z "$MOZ_OPTIMIZE_FLAGS"; then
 	MOZ_OPTIMIZE_FLAGS="-O"
 fi
 
-dnl Only one oddball right now (QNX), but this gives us flexibility
-dnl if any other platforms need to override this in the future.
-AC_DEFINE_UNQUOTED(D_INO,$DIRENT_INO)
-
 if test -z "$COMPILE_ENVIRONMENT"; then
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
 fi
 
 if test -n "$COMPILE_ENVIRONMENT"; then
     MOZ_COMPILER_OPTS
 fi
--- a/old-configure.in
+++ b/old-configure.in
@@ -452,17 +452,16 @@ fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
 dnl set the defaults first
 dnl ========================================================
 AS_BIN=$AS
 AR_EXTRACT='$(AR) x'
 AS='$(CC)'
 AS_DASH_C_FLAG='-c'
-DIRENT_INO=d_ino
 MOZ_USER_DIR=".mozilla"
 
 MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
 
 MOZ_FS_LAYOUT=unix
 
 dnl Configure platform-specific CPU architecture compiler options.
 dnl ==============================================================
@@ -1146,20 +1145,16 @@ AC_SUBST_LIST(SSSE3_FLAGS)
 
 AC_SUBST(MOZ_LINKER)
 if test -n "$MOZ_LINKER"; then
   AC_DEFINE(MOZ_LINKER)
   MOZ_LINKER_EXTRACT=1
   AC_CHECK_PROGS(XZ, xz)
 fi
 
-dnl Only one oddball right now (QNX), but this gives us flexibility
-dnl if any other platforms need to override this in the future.
-AC_DEFINE_UNQUOTED(D_INO,$DIRENT_INO)
-
 if test -z "$COMPILE_ENVIRONMENT"; then
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
     PKG_SKIP_STRIP=1
     MOZ_DEBUGGING_OPTS
 else
     MOZ_COMPILER_OPTS
 fi # COMPILE_ENVIRONMENT