From 4dd25ba2a5a0c8ff320debb03b7dc00f7d661927 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Fri, 7 Oct 2005 20:05:21 +0000 Subject: [PATCH] * amd/info_exec.c (exec_map_open): break assignment from inside conditional, to work around an IRIX-6.5 cc bug. * amd/Makefile.am (amd_LDADD): put libaminfo.a before libamu.la. Some linkers (e.g., IRIX-6.5) incorrectly complain about undefined symbols. --- ChangeLog | 7 +++++++ amd/Makefile.am | 2 +- amd/info_exec.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85caab5..4b20357 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-10-07 Erez Zadok + * amd/info_exec.c (exec_map_open): break assignment from inside + conditional, to work around an IRIX-6.5 cc bug. + + * amd/Makefile.am (amd_LDADD): put libaminfo.a before libamu.la. + Some linkers (e.g., IRIX-6.5) incorrectly complain about undefined + symbols. + * fsinfo/fsi_util.c (set_ether_if), amd/map.c (unmount_mp), libamu/xutil.c (expand_error), libamu/strutil.c (xsnprintf): avoid comparison between signed and unsigned integers. diff --git a/amd/Makefile.am b/amd/Makefile.am index 4be8cb5..db9cc7c 100644 --- a/amd/Makefile.am +++ b/amd/Makefile.am @@ -116,7 +116,7 @@ EXTRA_amd_SOURCES = \ # AMD_FS_OBJS: a list of ops_*.o objects added, depending on which # filesystem types this system supports. EXTRA_amd_OBJECTS = @AMD_FS_OBJS@ -amd_LDADD = $(EXTRA_amd_OBJECTS) get_args.o ../libamu/libamu.la libaminfo.a +amd_LDADD = $(EXTRA_amd_OBJECTS) get_args.o libaminfo.a ../libamu/libamu.la ############################################################################## sun2amd_SOURCES = \ diff --git a/amd/info_exec.c b/amd/info_exec.c index f7dc4d6..754d46a 100644 --- a/amd/info_exec.c +++ b/amd/info_exec.c @@ -287,7 +287,8 @@ exec_map_open(char *emap, char *key) return -1; case 0: /* child #1 */ - switch ((p2 = vfork())) { + p2 = vfork(); + switch (p2) { case -1: /* child #1: fork error */ exit(errno); -- 2.43.0