pkg/35085: audio/lame Solaris10 include

["Gilles Dauphin" <dauphin%enst.fr@localhost>]

>Number:         35085
>Category:       pkg
>Synopsis:       audio/lame Solaris10 include
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 20 13:15:00 +0000 2006
>Originator:     Gilles Dauphin
>Release:        SunOS 5.10 i86pc
>Organization:
ENST 
>Environment:


System: SunOS bi.enst.fr 5.10 Generic_118855-19 i86pc


>Description:


'lines' variable in brhist..c superseed solaris #define

if gcc -DHAVE_CONFIG_H  -I. -I. -I.. -I../libmp3lame -I../include -I..    -Wall 
-O   -MT brhist.o -MD -MP -MF ".deps/brhist.Tpo" -c -o brhist.o brhist.c; \
        then mv -f ".deps/brhist.Tpo" ".deps/brhist.Po"; else rm -f 
".deps/brhist.Tpo"; exit 1; fi
brhist.c: In function `brhist_init':
brhist.c:180: warning: passing arg 2 of `tgetent' discards qualifiers from 
pointer target type
brhist.c: In function `brhist_disp':
brhist.c:432: error: syntax error before '->' token
brhist.c:459: error: invalid type argument of `->'
brhist.c:465: error: invalid type argument of `->'
gmake[2]: *** [brhist.o] Error 1
gmake[2]: Leaving directory `/pkg/obj/audio/lame/work/lame-3.97/frontend'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/pkg/obj/audio/lame/work/lame-3.97'
gmake: *** [all] Error 2
*** Error code 2



>How-To-Repeat:


bmake


>Fix:


--- frontend/brhist.c.orig      Sun Sep 24 15:53:31 2006
+++ frontend/brhist.c   Mon Nov 20 14:02:55 2006
@@ -429,7 +429,7 @@
 void
 brhist_disp(const lame_global_flags * gf)
 {
-    int     i, lines = 0;
+    int     i, brh_lines = 0;
     int     br_hist[BRHIST_WIDTH]; /* how often a frame size was used */
     int     br_sm_hist[BRHIST_WIDTH][4]; /* how often a special frame 
size/stereo mode commbination was used */
     int     st_mode[4];
@@ -456,13 +456,13 @@
         if (most_often < br_hist[i])
             most_often = br_hist[i];
         if (br_hist[i])
-            ++lines;
+            ++brh_lines;
     }
 
     for (i = 0; i < BRHIST_WIDTH; i++) {
         int     show = br_hist[i];
 #ifdef RH_HIST
-        show = show && (lines > 1);
+        show = show && (brh_lines > 1);
 #endif
         if (show
             || (i >= brhist.vbr_bitrate_min_index