* 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.

diff --git a/ChangeLog b/ChangeLog
index 85caab5b38f19a36f7476bea43adfd9741402840..4b20357a160b85b978bbcffc4f2b0ea57ea77bcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-10-07  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * 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 4be8cb579043dd57d25ae4d393c2c3c5b8a11216..db9cc7cd059cf6dcf6fa8a26ec260bbcd1bd715e 100644 (file)
--- 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 f7dc4d6fb438f93071d5896a1f2486fab7288233..754d46a0bb3aa0d52ccf6bf3da92de3e3b63614f 100644 (file)
--- 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);