From: Ron F. <ro...@us...> - 2007-09-10 14:13:43
|
Update of /cvsroot/nscldaq/clients/daqstart In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28741/daqstart Modified Files: Tag: daqclients-8_1_maint cmdline.h Log Message: BZ320 - cesmacros/wienermacros did not generat correct code for HP variants.. conditionalize HP at compile time and modify the makefile includes for the HP variants to add -DHP by default. Index: cmdline.h =================================================================== RCS file: /cvsroot/nscldaq/clients/daqstart/cmdline.h,v retrieving revision 8.2 retrieving revision 8.2.2.1 diff -C2 -d -r8.2 -r8.2.2.1 *** cmdline.h 24 Jun 2005 11:33:34 -0000 8.2 --- cmdline.h 10 Sep 2007 14:13:38 -0000 8.2.2.1 *************** *** 1,13 **** /* cmdline.h */ ! /* File autogenerated by gengetopt version 2.10 */ ! ! #ifndef CMDLINE_H ! #define CMDLINE_H ! /* If we use autoconf. */ ! #ifdef HAVE_CONFIG_H ! #include "config.h" ! #endif #ifdef __cplusplus --- 1,8 ---- /* cmdline.h */ ! /* File autogenerated by gengetopt version 2.6 */ ! #ifndef _cmdline_h ! #define _cmdline_h #ifdef __cplusplus *************** *** 15,28 **** #endif /* __cplusplus */ ! #ifndef CMDLINE_PARSER_PACKAGE ! #define CMDLINE_PARSER_PACKAGE "daqstart" #endif ! ! #ifndef CMDLINE_PARSER_VERSION ! #define CMDLINE_PARSER_VERSION "1.0" #endif ! struct gengetopt_args_info ! { char * error_arg; /* Error log sink (e.g. file:myfile.log). */ char * output_arg; /* Output log sink (e.g. file:myfile.log). */ --- 10,24 ---- #endif /* __cplusplus */ ! /* Don't define PACKAGE and VERSION if we use automake. */ ! #if defined PACKAGE ! # undef PACKAGE #endif ! #define PACKAGE "daqstart" ! #if defined VERSION ! # undef VERSION #endif + #define VERSION "1.0" ! struct gengetopt_args_info { char * error_arg; /* Error log sink (e.g. file:myfile.log). */ char * output_arg; /* Output log sink (e.g. file:myfile.log). */ *************** *** 47,49 **** } #endif /* __cplusplus */ ! #endif /* CMDLINE_H */ --- 43,45 ---- } #endif /* __cplusplus */ ! #endif /* _cmdline_h */ |