Michael,
My guess:
You had had some local changes in hpitop.c and "svn update" run a merge.
The merge process was unsuccessful.
Svn marked problem places with <<<<< and >>>>.
Am I right?
Anton Pak
On Thu, 17 Jun 2010 20:30:54 +0400, Thompson, Michael
<[email protected]> wrote:
> I did:
>
> svn update
> ./bootstrap
> ./configure
> make clean
> make
>
> and got these errors:
>
> creating hpithres
> if gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../include -I../utils
> -I../utils -g -O2 -pthread -I/usr/include/glib-2.0
> -I/usr/lib/glib-2.0/include -Wall
> -Wmissing-prototypes -Wmissing-declarations
> -Wstrict-prototypes -Wpointer-arith -Wformat=2
> -Wformat-security -Wformat-nonliteral
> -Wno-format-y2k -Wcast-qual -Wcast-align
> -Wno-strict-aliasing -fno-strict-aliasing -Wno-unused-value
> -D_GNU_SOURCE -D_REENTRANT -fexceptions -MT hpitop.o -MD -MP -MF
> ".deps/hpitop.Tpo" -c -o hpitop.o hpitop.c; \
> then mv -f ".deps/hpitop.Tpo" ".deps/hpitop.Po"; else rm -f
> ".deps/hpitop.Tpo"; exit 1; fi
> hpitop.c: In function âmainâ:
> hpitop.c:125: error: syntax error before â<<â token
> hpitop.c:122: warning: unused variable âcâ
> hpitop.c:121: warning: unused variable âprintusageâ
> hpitop.c:120: warning: unused variable âresourceidâ
> hpitop.c:119: warning: unused variable âsessionidâ
> hpitop.c:118: warning: unused variable âdomainidâ
> hpitop.c:116: warning: unused variable ârvâ
> hpitop.c: At top level:
> hpitop.c:149: warning: type defaults to âintâ in declaration of
> âf_allresâ
> hpitop.c:149: error: redefinition of âf_allresâ
> hpitop.c:107: error: previous definition of âf_allresâ was here
> hpitop.c:149: warning: data definition has no type or storage class
> hpitop.c:150: error: syntax error before â}â token
> hpitop.c:161: error: syntax error before string constant
> hpitop.c:161: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:161: warning: function declaration isnât a prototype
> hpitop.c:161: error: conflicting types for âprintfâ
> hpitop.c:161: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:161: warning: data definition has no type or storage class
> hpitop.c:162: error: syntax error before string constant
> hpitop.c:162: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:162: warning: function declaration isnât a prototype
> hpitop.c:162: error: conflicting types for âprintfâ
> hpitop.c:162: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:162: warning: data definition has no type or storage class
> hpitop.c:163: error: syntax error before string constant
> hpitop.c:163: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:163: warning: function declaration isnât a prototype
> hpitop.c:163: error: conflicting types for âprintfâ
> hpitop.c:163: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:163: warning: data definition has no type or storage class
> hpitop.c:164: error: syntax error before string constant
> hpitop.c:164: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:164: warning: function declaration isnât a prototype
> hpitop.c:164: error: conflicting types for âprintfâ
> hpitop.c:164: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:164: warning: data definition has no type or storage class
> hpitop.c:165: error: syntax error before string constant
> hpitop.c:165: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:165: warning: function declaration isnât a prototype
> hpitop.c:165: error: conflicting types for âprintfâ
> hpitop.c:165: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:165: warning: data definition has no type or storage class
> hpitop.c:166: error: syntax error before string constant
> hpitop.c:166: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:166: warning: function declaration isnât a prototype
> hpitop.c:166: error: conflicting types for âprintfâ
> hpitop.c:166: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:166: warning: data definition has no type or storage class
> hpitop.c:167: error: syntax error before string constant
> hpitop.c:167: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:167: warning: function declaration isnât a prototype
> hpitop.c:167: error: conflicting types for âprintfâ
> hpitop.c:167: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:167: warning: data definition has no type or storage class
> hpitop.c:168: error: syntax error before string constant
> hpitop.c:168: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:168: warning: function declaration isnât a prototype
> hpitop.c:168: error: conflicting types for âprintfâ
> hpitop.c:168: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:168: warning: data definition has no type or storage class
> hpitop.c:169: error: syntax error before string constant
> hpitop.c:169: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:169: warning: function declaration isnât a prototype
> hpitop.c:169: error: conflicting types for âprintfâ
> hpitop.c:169: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:169: warning: data definition has no type or storage class
> hpitop.c:170: error: syntax error before string constant
> hpitop.c:170: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:170: warning: function declaration isnât a prototype
> hpitop.c:170: error: conflicting types for âprintfâ
> hpitop.c:170: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:170: warning: data definition has no type or storage class
> hpitop.c:171: error: syntax error before string constant
> hpitop.c:171: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:171: warning: function declaration isnât a prototype
> hpitop.c:171: error: conflicting types for âprintfâ
> hpitop.c:171: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:171: warning: data definition has no type or storage class
> hpitop.c:172: error: syntax error before string constant
> hpitop.c:172: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:172: warning: function declaration isnât a prototype
> hpitop.c:172: error: conflicting types for âprintfâ
> hpitop.c:172: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:172: warning: data definition has no type or storage class
> hpitop.c:173: error: syntax error before string constant
> hpitop.c:173: warning: type defaults to âintâ in declaration of âprintfâ
> hpitop.c:173: warning: function declaration isnât a prototype
> hpitop.c:173: error: conflicting types for âprintfâ
> hpitop.c:173: note: a parameter list with an ellipsis canât match an
> empty parameter name list declaration
> hpitop.c:173: warning: data definition has no type or storage class
> hpitop.c:174: error: syntax error before numeric constant
> hpitop.c:174: warning: type defaults to âintâ in declaration of âexitâ
> hpitop.c:174: warning: function declaration isnât a prototype
> hpitop.c:174: error: conflicting types for âexitâ
> hpitop.c:174: warning: data definition has no type or storage class
> hpitop.c:178: error: syntax error before numeric constant
> hpitop.c:178: warning: type defaults to âintâ in declaration of âmemsetâ
> hpitop.c:178: warning: function declaration isnât a prototype
> hpitop.c:178: error: conflicting types for âmemsetâ
> hpitop.c:178: warning: data definition has no type or storage class
> hpitop.c:184: warning: type defaults to âintâ in declaration of ârvâ
> hpitop.c:184: error: âdomainidâ undeclared here (not in a function)
> hpitop.c:184: error: âsessionidâ undeclared here (not in a function)
> hpitop.c:184: error: initializer element is not constant
> hpitop.c:184: warning: data definition has no type or storage class
> hpitop.c:185: error: syntax error before âifâ
> hpitop.c:187: error: syntax error before â-â token
> hpitop.c:187: warning: type defaults to âintâ in declaration of âexitâ
> hpitop.c:187: warning: function declaration isnât a prototype
> hpitop.c:187: error: conflicting types for âexitâ
> hpitop.c:187: warning: data definition has no type or storage class
> hpitop.c:196: warning: type defaults to âintâ in declaration of ârvâ
> hpitop.c:196: error: redefinition of ârvâ
> hpitop.c:184: error: previous definition of ârvâ was here
> hpitop.c:196: error: initializer element is not constant
> hpitop.c:196: warning: data definition has no type or storage class
> hpitop.c:197: error: syntax error before âifâ
> hpitop.c:199: error: syntax error before â-â token
> hpitop.c:199: warning: type defaults to âintâ in declaration of âexitâ
> hpitop.c:199: warning: function declaration isnât a prototype
> hpitop.c:199: error: conflicting types for âexitâ
> hpitop.c:199: warning: data definition has no type or storage class
> hpitop.c:203: warning: type defaults to âintâ in declaration of
> âlist_resourcesâ
> hpitop.c:203: warning: parameter names (without types) in function
> declaration
> hpitop.c:203: warning: data definition has no type or storage class
> hpitop.c:205: warning: type defaults to âintâ in declaration of ârvâ
> hpitop.c:205: error: redefinition of ârvâ
> hpitop.c:184: error: previous definition of ârvâ was here
> hpitop.c:205: error: initializer element is not constant
> hpitop.c:205: warning: data definition has no type or storage class
> hpitop.c:207: error: syntax error before numeric constant
> hpitop.c:207: warning: type defaults to âintâ in declaration of âexitâ
> hpitop.c:207: warning: function declaration isnât a prototype
> hpitop.c:207: error: conflicting types for âexitâ
> hpitop.c:207: warning: data definition has no type or storage class
> make[2]: *** [hpitop.o] Error 1
> make[2]: Leaving directory `/PPS/openhpi-development/trunk/clients'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/PPS/openhpi-development/trunk'
> make: *** [all] Error 2
>
> ________________________________
> From: Bishop, Michael (ISB Linux/Telco) [mailto:[email protected]]
> Sent: Thursday, June 17, 2010 11:27 AM
> To: 'Kleber, Ulrich (NSN - DE/Munich)'
> Cc: [email protected]
> Subject: [Openhpi-devel] Starting release cycle for 2.15.0
>
> Uli -
>
> Thanks for commiting your changes. I will start building/testing
> revision 7111 today.
>
> Everyone: We are now officially in the release cycle for 2.15.0. Please
> download and start testing 7111. Defect fixes are allowed, as are very
> minor (very low-risk) enhancements. Please have changes peer-reviewed
> before commiting them.
>
> The plan is to test/fix defects the rest of this week and all of next
> week - and attempt to release the week starting on June 28.
>
> As a reminder, I will be out of the office next week (June 21 - 25) - so
> I won't be bugging you - but you all have your assignment. :-)
>
> Cheers!
> --michael
>
>
>
> -----Original Message-----
> From: Kleber, Ulrich (NSN - DE/Munich) [mailto:[email protected]]
> Sent: Thursday, June 17, 2010 12:01 AM
> To: Bishop, Michael (ISB Linux/Telco)
> Cc: [email protected]
> Subject: RE: Patch for new option to support domains in clients
> Thanks, Michael!
>
> Somehow the man pages for hpiinv were not included in the patch file,
> but I did them. So it is no problem to commit everything today.
> Cheers,
> Uli
>
> ________________________________
> From: ext Bishop, Michael (ISB Linux/Telco)
> [mailto:[email protected]]
> Sent: Wednesday, June 16, 2010 10:42 PM
> To: Kleber, Ulrich (NSN - DE/Munich)
> Cc: '[email protected]'
> Subject: RE: Patch for new option to support domains in clients
> Uli --
>
> I've been testing rev. 7110 with your patch for the OpenHPI client
> enhancements. I've tested make, make distcheck, ran the hpitest
> conformance tests, built/installed rpms, ran some of the clients, etc.
> It all looks good - except I do not see an updated man page for hpiinv -
> which is one of the client apps that you added the -D option to. Is the
> man page for hpiinv in a separate patch?
>
> Other than that - it looks good to commit. Please update/close the
> ticket associated with this enhancement - and be sure to include the svn
> revision number for this change in the text of the update. Thanks.
>
> --michael
>
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Openhpi-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openhpi-devel
