aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPip Cet2025-01-17 17:13:29 +0000
committerPip Cet2025-01-17 17:22:45 +0000
commit2a00bedeaef0a0caf8c810842c524b5c46de06ed (patch)
tree68c6a245bb5b48e6fd4df4d250bae553f477fa5a /src
parent91b2b3654f2dcf79c15a11cfe1130df6638b4a4e (diff)
downloademacs-2a00bedeaef0a0caf8c810842c524b5c46de06ed.tar.gz
emacs-2a00bedeaef0a0caf8c810842c524b5c46de06ed.zip
Fix build on Solaris 10 (bug#75451)
* autogen.sh: Avoid bashism. * configure.ac (AC_PROG_AWK): Use. * src/Makefile.in (AWK): Set. (dmpstruct.h): Use "$(AWK)", not "awk". * src/dired.c (DT_UNKNOWN, DT_DIR, DT_LNK): Define all three constants or none of them.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in3
-rw-r--r--src/dired.c12
2 files changed, 13 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 784aadd1689..d987124d29d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -60,6 +60,7 @@ LDFLAGS = @LDFLAGS@
60EXEEXT = @EXEEXT@ 60EXEEXT = @EXEEXT@
61version = @version@ 61version = @version@
62MKDIR_P = @MKDIR_P@ 62MKDIR_P = @MKDIR_P@
63AWK = @AWK@
63# Don't use LIBS. configure puts stuff in it that either shouldn't be 64# Don't use LIBS. configure puts stuff in it that either shouldn't be
64# linked with Emacs or is duplicated by the other stuff below. 65# linked with Emacs or is duplicated by the other stuff below.
65# LIBS = @LIBS@ 66# LIBS = @LIBS@
@@ -543,7 +544,7 @@ pdumper.o: dmpstruct.h
543endif 544endif
544dmpstruct.h: $(srcdir)/dmpstruct.awk 545dmpstruct.h: $(srcdir)/dmpstruct.awk
545dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) 546dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers)
546 $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ 547 $(AM_V_GEN)POSIXLY_CORRECT=1 $(AWK) -f $(srcdir)/dmpstruct.awk \
547 $(dmpstruct_headers) > $@ 548 $(dmpstruct_headers) > $@
548 549
549AUTO_DEPEND = @AUTO_DEPEND@ 550AUTO_DEPEND = @AUTO_DEPEND@
diff --git a/src/dired.c b/src/dired.c
index 89d6033f9b9..2501e7d8ab7 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -79,7 +79,17 @@ dirent_namelen (struct dirent *dp)
79} 79}
80 80
81#ifndef HAVE_STRUCT_DIRENT_D_TYPE 81#ifndef HAVE_STRUCT_DIRENT_D_TYPE
82enum { DT_UNKNOWN, DT_DIR, DT_LNK }; 82#if !defined (DT_UNKNOWN) && !defined (DT_DIR) && !defined (DT_LNK)
83enum {
84 DT_UNKNOWN,
85 DT_DIR,
86 DT_LNK,
87};
88#elif defined (DT_UNKNOWN) && defined (DT_DIR) && defined (DT_LNK)
89/* Nothing to do here, all three are defined as macros. */
90#elif defined (DT_UNKNOWN) || defined (DT_DIR) || defined (DT_LNK)
91#error "Cannot determine DT_UNKNOWN, DT_DIR, DT_LNK"
92#endif
83#endif 93#endif
84 94
85/* Return the file type of DP. */ 95/* Return the file type of DP. */