Re: HP-UX and AIX buiild problems and patches

["Andrew V. Samoilov" <sav bcs zp ua>]

Alexander Varakin пишет:
> The problem here is that app_text was declared as
>
> extern const char app_text [];
>
> in header file, and then it was defined in c file as
>
> static const char app_text [] = ....
>
> which is not consistent, so the compiler complained about this.
>
> Alex
>
>
> > From: "Andrew V. Samoilov" <sav bcs zp ua>
> > To: Alexander Varakin <avarakin00 hotmail com>
> > CC: mc-devel gnome org, kil systema ru
> > Subject: Re: HP-UX and AIX buiild problems and patches
> > Date: Mon, 27 Jan 2003 19:17:23 +0200
> >
> > Alexander Varakin wrote:
> >
> > > Hi Andrew,
> > >
> > > I don't have access to AIX box right now, but I am sure that the 
> > > build problems in util.c are not warnings. The AIX xlc_r compiler is 
> > > very strict, so it produced errors there.
> >
> >
> > Attached hunk of your AIX patch is not clear for me:
> >
> > --
> > Regards,
> > Andrew V. Samoilov
> > *** mc-4.6.0-pre3/src/util.c    Wed Jan 22 01:12:16 2003
> > --- mc-4.6.0-pre3.org/src/util.c    Fri Jan 24 10:28:17 2003
> > ***************
> > *** 47,53 ****
> >   #include "charsets.h"
> >   #endif
> >
> > ! static const char app_text [] = "Midnight-Commander";
> >   int easy_patterns = 1;
> >
> >   static inline int
> > --- 47,54 ----
> >   #include "charsets.h"
> >   #endif
> >
> > !
> > ! const char app_text [] = "Midnight-Commander";
> >   int easy_patterns = 1;
> >
> >   static inline int

I removed app_text declaration from util.h.
Thanks for report.

MC compilation must be smoothly now on AIX and possible some other systems.

--
Regards,
Andrew V. Samoilov

Index: mc/src/ChangeLog
diff -u mc/src/ChangeLog:1.1108 mc/src/ChangeLog:1.1109
--- mc/src/ChangeLog:1.1108	Mon Jan 27 12:16:11 2003
+++ mc/src/ChangeLog	Mon Jan 27 12:51:53 2003
@@ -1,3 +1,9 @@
+2003-01-27  Andrew V. Samoilov  <sav bcs zp ua>
+
+	* mountlist.c (read_filesystem_list) [MOUNTED_GETMNTENT1]:
+	Check for MOUNTED is defined to fix compilation on AIX.
+	Reported by Alexander Varakin <avarakin00 hotmail com>.
+
 2003-01-27  Pavel Roskin  <proski gnu org>
 
 	* main.c (update_xterm_title_path): Use is_printable().
Index: mc/src/mountlist.c
diff -u mc/src/mountlist.c:1.14 mc/src/mountlist.c:1.15
--- mc/src/mountlist.c:1.14	Tue Sep 24 18:19:32 2002
+++ mc/src/mountlist.c	Mon Jan 27 12:51:53 2003
@@ -201,13 +201,13 @@
     mlist = mtail = me;
 
 #ifdef MOUNTED_GETMNTENT1	/* 4.3BSD, SunOS, HP-UX, Dynix, Irix.  */
+#ifdef MOUNTED
     {
 	struct mntent *mnt;
-	char *table = MOUNTED;
 	FILE *fp;
 	char *devopt;
 
-	fp = setmntent (table, "r");
+	fp = setmntent (MOUNTED, "r");
 	if (fp == NULL)
 	    return NULL;
 
@@ -238,6 +238,7 @@
 	if (endmntent (fp) == 0)
 	    return NULL;
     }
+#endif /* MOUNTED */
 #endif /* MOUNTED_GETMNTENT1 */
 
 #ifdef MOUNTED_GETMNTINFO	/* 4.4BSD.  */