From: Harlan Stenn Date: Tue, 21 Jul 2009 08:22:31 +0000 (-0400) Subject: Upgrade to autogen-5.9.9pre1 X-Git-Tag: NTP_4_2_5P191~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29fd7a3571f6aa7ab8bca44c7532b660956dfd1f;p=thirdparty%2Fntp.git Upgrade to autogen-5.9.9pre1 bk: 4a657ac7YjI7nj16q3B4AKmQGT0-MQ --- diff --git a/ChangeLog b/ChangeLog index fec661139..73fc7a683 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +* Updated to AutoGen-5.9.9pre1. (4.2.5p190) 2009/07/20 Released by Harlan Stenn * Updated to AutoGen-5.9.8. * [Bug 1248] RES_MSSNTP typo in ntp_proto.c. diff --git a/gsoc_sntp/libopts/ag-char-map.h b/gsoc_sntp/libopts/ag-char-map.h index 2450a3d6c..6309da4bf 100644 --- a/gsoc_sntp/libopts/ag-char-map.h +++ b/gsoc_sntp/libopts/ag-char-map.h @@ -1,5 +1,5 @@ /* - * Character mapping generated 05/16/09 08:16:06 + * Character mapping generated 07/20/09 21:05:27 * * This file contains the character classifications * used by AutoGen and AutoOpts for identifying tokens. diff --git a/gsoc_sntp/libopts/autoopts/options.h b/gsoc_sntp/libopts/autoopts/options.h index e1eb5a64f..453f80039 100644 --- a/gsoc_sntp/libopts/autoopts/options.h +++ b/gsoc_sntp/libopts/autoopts/options.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (options.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:53 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions funcs.def * and the template file options_h * @@ -773,7 +773,7 @@ extern int optionProcess(tOptions*, int, char**); extern void optionRestore(tOptions*); -/* From: save.c line 670 +/* From: save.c line 671 * * optionSaveFile - saves the option state to a file * diff --git a/gsoc_sntp/libopts/autoopts/usage-txt.h b/gsoc_sntp/libopts/autoopts/usage-txt.h index 1d4cd4ae8..eef1ff0c2 100644 --- a/gsoc_sntp/libopts/autoopts/usage-txt.h +++ b/gsoc_sntp/libopts/autoopts/usage-txt.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (usage-txt.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:52 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:13 PM PDT * From the definitions usage-txt.def * and the template file usage-txt.tpl * diff --git a/gsoc_sntp/libopts/environment.c b/gsoc_sntp/libopts/environment.c index d69672214..b2765ae9b 100644 --- a/gsoc_sntp/libopts/environment.c +++ b/gsoc_sntp/libopts/environment.c @@ -1,7 +1,7 @@ /* - * $Id: environment.c,v 4.19 2009/01/17 22:08:07 bkorb Exp $ - * Time-stamp: "2009-01-12 05:52:44 bkorb" + * $Id: environment.c,v 4.20 2009/07/21 03:23:12 bkorb Exp $ + * Time-stamp: "2009-07-20 20:12:24 bkorb" * * This file contains all of the routines that must be linked into * an executable to use the generated option processing. The optional @@ -224,7 +224,8 @@ doEnvPresets( tOptions* pOpts, teEnvPresetType type ) /* * Special handling for ${PROGNAME_LOAD_OPTS} */ - if (pOpts->specOptIdx.save_opts != 0) { + if ( (pOpts->specOptIdx.save_opts != NO_EQUIVALENT) + && (pOpts->specOptIdx.save_opts != 0)) { st.pOD = pOpts->pOptDesc + pOpts->specOptIdx.save_opts + 1; strcpy( pzFlagName, st.pOD->pz_NAME ); checkEnvOpt(&st, zEnvName, pOpts, type); diff --git a/gsoc_sntp/libopts/genshell.c b/gsoc_sntp/libopts/genshell.c index 3c1d43954..ce8771805 100644 --- a/gsoc_sntp/libopts/genshell.c +++ b/gsoc_sntp/libopts/genshell.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (genshell.c) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:54 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions genshell.def * and the template file options * diff --git a/gsoc_sntp/libopts/genshell.h b/gsoc_sntp/libopts/genshell.h index 0e9673403..7809702d4 100644 --- a/gsoc_sntp/libopts/genshell.h +++ b/gsoc_sntp/libopts/genshell.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (genshell.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:54 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions genshell.def * and the template file options * diff --git a/gsoc_sntp/libopts/m4/libopts.m4 b/gsoc_sntp/libopts/m4/libopts.m4 index 498efc7aa..ddb16e3c2 100644 --- a/gsoc_sntp/libopts/m4/libopts.m4 +++ b/gsoc_sntp/libopts/m4/libopts.m4 @@ -2,7 +2,7 @@ dnl -*- buffer-read-only: t -*- vi: set ro: dnl dnl DO NOT EDIT THIS FILE (libopts.m4) dnl -dnl It has been AutoGen-ed Saturday May 16, 2009 at 08:15:55 AM PDT +dnl It has been AutoGen-ed Monday July 20, 2009 at 09:05:16 PM PDT dnl From the definitions libopts.def dnl and the template file conftest.tpl dnl diff --git a/gsoc_sntp/libopts/proto.h b/gsoc_sntp/libopts/proto.h index 9c594cfa6..3b70d359a 100644 --- a/gsoc_sntp/libopts/proto.h +++ b/gsoc_sntp/libopts/proto.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: * * Prototypes for autoopts - * Generated Sat May 16 08:15:54 PDT 2009 + * Generated Mon Jul 20 21:05:15 PDT 2009 */ #ifndef AUTOOPTS_PROTO_H_GUARD #define AUTOOPTS_PROTO_H_GUARD 1 diff --git a/gsoc_sntp/libopts/save.c b/gsoc_sntp/libopts/save.c index a670fa8bb..290c81765 100644 --- a/gsoc_sntp/libopts/save.c +++ b/gsoc_sntp/libopts/save.c @@ -1,7 +1,7 @@ /* - * save.c $Id: save.c,v 4.29 2009/01/01 16:51:49 bkorb Exp $ - * Time-stamp: "2008-09-23 14:24:58 bkorb" + * save.c $Id: save.c,v 4.31 2009/07/21 04:01:29 bkorb Exp $ + * Time-stamp: "2009-07-20 20:40:28 bkorb" * * This module's routines will take the currently set options and * store them into an ".rc" file for re-interpretation the next @@ -81,7 +81,8 @@ findDirName( tOptions* pOpts, int* p_free ) { tCC* pzDir; - if (pOpts->specOptIdx.save_opts == 0) + if ( (pOpts->specOptIdx.save_opts == NO_EQUIVALENT) + || (pOpts->specOptIdx.save_opts == 0)) return NULL; pzDir = pOpts->pOptDesc[ pOpts->specOptIdx.save_opts ].optArg.argString; diff --git a/gsoc_sntp/libopts/value-type.c b/gsoc_sntp/libopts/value-type.c index 34227b51b..27c010be0 100644 --- a/gsoc_sntp/libopts/value-type.c +++ b/gsoc_sntp/libopts/value-type.c @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ #if 0 /* gperf build options: */ @@ -91,9 +91,6 @@ static const value_type_map_t value_type_table[] = }; #ifdef __GNUC__ -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif static inline const value_type_map_t * find_value_type_name (register const char *str, register unsigned int len) diff --git a/gsoc_sntp/libopts/value-type.h b/gsoc_sntp/libopts/value-type.h index a3ee4b4ea..4c1747141 100644 --- a/gsoc_sntp/libopts/value-type.h +++ b/gsoc_sntp/libopts/value-type.h @@ -1,5 +1,5 @@ /* - * Generated header for gperf generated source Sat May 16 08:16:06 PDT 2009 + * Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009 * This file enumerates the list of names and declares the * procedure for mapping string names to the enum value. */ diff --git a/gsoc_sntp/libopts/xat-attribute.c b/gsoc_sntp/libopts/xat-attribute.c index 3b83636fd..85b735fb6 100644 --- a/gsoc_sntp/libopts/xat-attribute.c +++ b/gsoc_sntp/libopts/xat-attribute.c @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ #if 0 /* gperf build options: */ @@ -82,9 +82,6 @@ static const xat_attribute_map_t xat_attribute_table[] = }; #ifdef __GNUC__ -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif static inline const xat_attribute_map_t * find_xat_attribute_name (register const char *str, register unsigned int len) diff --git a/gsoc_sntp/libopts/xat-attribute.h b/gsoc_sntp/libopts/xat-attribute.h index 5627bc823..0a82a6b18 100644 --- a/gsoc_sntp/libopts/xat-attribute.h +++ b/gsoc_sntp/libopts/xat-attribute.h @@ -1,5 +1,5 @@ /* - * Generated header for gperf generated source Sat May 16 08:16:06 PDT 2009 + * Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009 * This file enumerates the list of names and declares the * procedure for mapping string names to the enum value. */ diff --git a/libopts/ag-char-map.h b/libopts/ag-char-map.h index 2450a3d6c..6309da4bf 100644 --- a/libopts/ag-char-map.h +++ b/libopts/ag-char-map.h @@ -1,5 +1,5 @@ /* - * Character mapping generated 05/16/09 08:16:06 + * Character mapping generated 07/20/09 21:05:27 * * This file contains the character classifications * used by AutoGen and AutoOpts for identifying tokens. diff --git a/libopts/autoopts/options.h b/libopts/autoopts/options.h index e1eb5a64f..453f80039 100644 --- a/libopts/autoopts/options.h +++ b/libopts/autoopts/options.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (options.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:53 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions funcs.def * and the template file options_h * @@ -773,7 +773,7 @@ extern int optionProcess(tOptions*, int, char**); extern void optionRestore(tOptions*); -/* From: save.c line 670 +/* From: save.c line 671 * * optionSaveFile - saves the option state to a file * diff --git a/libopts/autoopts/usage-txt.h b/libopts/autoopts/usage-txt.h index 1d4cd4ae8..eef1ff0c2 100644 --- a/libopts/autoopts/usage-txt.h +++ b/libopts/autoopts/usage-txt.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (usage-txt.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:52 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:13 PM PDT * From the definitions usage-txt.def * and the template file usage-txt.tpl * diff --git a/libopts/environment.c b/libopts/environment.c index d69672214..b2765ae9b 100644 --- a/libopts/environment.c +++ b/libopts/environment.c @@ -1,7 +1,7 @@ /* - * $Id: environment.c,v 4.19 2009/01/17 22:08:07 bkorb Exp $ - * Time-stamp: "2009-01-12 05:52:44 bkorb" + * $Id: environment.c,v 4.20 2009/07/21 03:23:12 bkorb Exp $ + * Time-stamp: "2009-07-20 20:12:24 bkorb" * * This file contains all of the routines that must be linked into * an executable to use the generated option processing. The optional @@ -224,7 +224,8 @@ doEnvPresets( tOptions* pOpts, teEnvPresetType type ) /* * Special handling for ${PROGNAME_LOAD_OPTS} */ - if (pOpts->specOptIdx.save_opts != 0) { + if ( (pOpts->specOptIdx.save_opts != NO_EQUIVALENT) + && (pOpts->specOptIdx.save_opts != 0)) { st.pOD = pOpts->pOptDesc + pOpts->specOptIdx.save_opts + 1; strcpy( pzFlagName, st.pOD->pz_NAME ); checkEnvOpt(&st, zEnvName, pOpts, type); diff --git a/libopts/genshell.c b/libopts/genshell.c index 3c1d43954..ce8771805 100644 --- a/libopts/genshell.c +++ b/libopts/genshell.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (genshell.c) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:54 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions genshell.def * and the template file options * diff --git a/libopts/genshell.h b/libopts/genshell.h index 0e9673403..7809702d4 100644 --- a/libopts/genshell.h +++ b/libopts/genshell.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (genshell.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:54 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions genshell.def * and the template file options * diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4 index 498efc7aa..ddb16e3c2 100644 --- a/libopts/m4/libopts.m4 +++ b/libopts/m4/libopts.m4 @@ -2,7 +2,7 @@ dnl -*- buffer-read-only: t -*- vi: set ro: dnl dnl DO NOT EDIT THIS FILE (libopts.m4) dnl -dnl It has been AutoGen-ed Saturday May 16, 2009 at 08:15:55 AM PDT +dnl It has been AutoGen-ed Monday July 20, 2009 at 09:05:16 PM PDT dnl From the definitions libopts.def dnl and the template file conftest.tpl dnl diff --git a/libopts/proto.h b/libopts/proto.h index 9c594cfa6..3b70d359a 100644 --- a/libopts/proto.h +++ b/libopts/proto.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: * * Prototypes for autoopts - * Generated Sat May 16 08:15:54 PDT 2009 + * Generated Mon Jul 20 21:05:15 PDT 2009 */ #ifndef AUTOOPTS_PROTO_H_GUARD #define AUTOOPTS_PROTO_H_GUARD 1 diff --git a/libopts/save.c b/libopts/save.c index a670fa8bb..290c81765 100644 --- a/libopts/save.c +++ b/libopts/save.c @@ -1,7 +1,7 @@ /* - * save.c $Id: save.c,v 4.29 2009/01/01 16:51:49 bkorb Exp $ - * Time-stamp: "2008-09-23 14:24:58 bkorb" + * save.c $Id: save.c,v 4.31 2009/07/21 04:01:29 bkorb Exp $ + * Time-stamp: "2009-07-20 20:40:28 bkorb" * * This module's routines will take the currently set options and * store them into an ".rc" file for re-interpretation the next @@ -81,7 +81,8 @@ findDirName( tOptions* pOpts, int* p_free ) { tCC* pzDir; - if (pOpts->specOptIdx.save_opts == 0) + if ( (pOpts->specOptIdx.save_opts == NO_EQUIVALENT) + || (pOpts->specOptIdx.save_opts == 0)) return NULL; pzDir = pOpts->pOptDesc[ pOpts->specOptIdx.save_opts ].optArg.argString; diff --git a/libopts/value-type.c b/libopts/value-type.c index 34227b51b..27c010be0 100644 --- a/libopts/value-type.c +++ b/libopts/value-type.c @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ #if 0 /* gperf build options: */ @@ -91,9 +91,6 @@ static const value_type_map_t value_type_table[] = }; #ifdef __GNUC__ -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif static inline const value_type_map_t * find_value_type_name (register const char *str, register unsigned int len) diff --git a/libopts/value-type.h b/libopts/value-type.h index a3ee4b4ea..4c1747141 100644 --- a/libopts/value-type.h +++ b/libopts/value-type.h @@ -1,5 +1,5 @@ /* - * Generated header for gperf generated source Sat May 16 08:16:06 PDT 2009 + * Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009 * This file enumerates the list of names and declares the * procedure for mapping string names to the enum value. */ diff --git a/libopts/xat-attribute.c b/libopts/xat-attribute.c index 3b83636fd..85b735fb6 100644 --- a/libopts/xat-attribute.c +++ b/libopts/xat-attribute.c @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ #if 0 /* gperf build options: */ @@ -82,9 +82,6 @@ static const xat_attribute_map_t xat_attribute_table[] = }; #ifdef __GNUC__ -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif static inline const xat_attribute_map_t * find_xat_attribute_name (register const char *str, register unsigned int len) diff --git a/libopts/xat-attribute.h b/libopts/xat-attribute.h index 5627bc823..0a82a6b18 100644 --- a/libopts/xat-attribute.h +++ b/libopts/xat-attribute.h @@ -1,5 +1,5 @@ /* - * Generated header for gperf generated source Sat May 16 08:16:06 PDT 2009 + * Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009 * This file enumerates the list of names and declares the * procedure for mapping string names to the enum value. */ diff --git a/sntp/libopts/ag-char-map.h b/sntp/libopts/ag-char-map.h index 2450a3d6c..6309da4bf 100644 --- a/sntp/libopts/ag-char-map.h +++ b/sntp/libopts/ag-char-map.h @@ -1,5 +1,5 @@ /* - * Character mapping generated 05/16/09 08:16:06 + * Character mapping generated 07/20/09 21:05:27 * * This file contains the character classifications * used by AutoGen and AutoOpts for identifying tokens. diff --git a/sntp/libopts/autoopts/options.h b/sntp/libopts/autoopts/options.h index e1eb5a64f..453f80039 100644 --- a/sntp/libopts/autoopts/options.h +++ b/sntp/libopts/autoopts/options.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (options.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:53 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions funcs.def * and the template file options_h * @@ -773,7 +773,7 @@ extern int optionProcess(tOptions*, int, char**); extern void optionRestore(tOptions*); -/* From: save.c line 670 +/* From: save.c line 671 * * optionSaveFile - saves the option state to a file * diff --git a/sntp/libopts/autoopts/usage-txt.h b/sntp/libopts/autoopts/usage-txt.h index 1d4cd4ae8..eef1ff0c2 100644 --- a/sntp/libopts/autoopts/usage-txt.h +++ b/sntp/libopts/autoopts/usage-txt.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (usage-txt.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:52 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:13 PM PDT * From the definitions usage-txt.def * and the template file usage-txt.tpl * diff --git a/sntp/libopts/environment.c b/sntp/libopts/environment.c index d69672214..b2765ae9b 100644 --- a/sntp/libopts/environment.c +++ b/sntp/libopts/environment.c @@ -1,7 +1,7 @@ /* - * $Id: environment.c,v 4.19 2009/01/17 22:08:07 bkorb Exp $ - * Time-stamp: "2009-01-12 05:52:44 bkorb" + * $Id: environment.c,v 4.20 2009/07/21 03:23:12 bkorb Exp $ + * Time-stamp: "2009-07-20 20:12:24 bkorb" * * This file contains all of the routines that must be linked into * an executable to use the generated option processing. The optional @@ -224,7 +224,8 @@ doEnvPresets( tOptions* pOpts, teEnvPresetType type ) /* * Special handling for ${PROGNAME_LOAD_OPTS} */ - if (pOpts->specOptIdx.save_opts != 0) { + if ( (pOpts->specOptIdx.save_opts != NO_EQUIVALENT) + && (pOpts->specOptIdx.save_opts != 0)) { st.pOD = pOpts->pOptDesc + pOpts->specOptIdx.save_opts + 1; strcpy( pzFlagName, st.pOD->pz_NAME ); checkEnvOpt(&st, zEnvName, pOpts, type); diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c index 3c1d43954..ce8771805 100644 --- a/sntp/libopts/genshell.c +++ b/sntp/libopts/genshell.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (genshell.c) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:54 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions genshell.def * and the template file options * diff --git a/sntp/libopts/genshell.h b/sntp/libopts/genshell.h index 0e9673403..7809702d4 100644 --- a/sntp/libopts/genshell.h +++ b/sntp/libopts/genshell.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (genshell.h) * - * It has been AutoGen-ed Saturday May 16, 2009 at 08:15:54 AM PDT + * It has been AutoGen-ed Monday July 20, 2009 at 09:05:14 PM PDT * From the definitions genshell.def * and the template file options * diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4 index 498efc7aa..ddb16e3c2 100644 --- a/sntp/libopts/m4/libopts.m4 +++ b/sntp/libopts/m4/libopts.m4 @@ -2,7 +2,7 @@ dnl -*- buffer-read-only: t -*- vi: set ro: dnl dnl DO NOT EDIT THIS FILE (libopts.m4) dnl -dnl It has been AutoGen-ed Saturday May 16, 2009 at 08:15:55 AM PDT +dnl It has been AutoGen-ed Monday July 20, 2009 at 09:05:16 PM PDT dnl From the definitions libopts.def dnl and the template file conftest.tpl dnl diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h index 9c594cfa6..3b70d359a 100644 --- a/sntp/libopts/proto.h +++ b/sntp/libopts/proto.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: * * Prototypes for autoopts - * Generated Sat May 16 08:15:54 PDT 2009 + * Generated Mon Jul 20 21:05:15 PDT 2009 */ #ifndef AUTOOPTS_PROTO_H_GUARD #define AUTOOPTS_PROTO_H_GUARD 1 diff --git a/sntp/libopts/save.c b/sntp/libopts/save.c index a670fa8bb..290c81765 100644 --- a/sntp/libopts/save.c +++ b/sntp/libopts/save.c @@ -1,7 +1,7 @@ /* - * save.c $Id: save.c,v 4.29 2009/01/01 16:51:49 bkorb Exp $ - * Time-stamp: "2008-09-23 14:24:58 bkorb" + * save.c $Id: save.c,v 4.31 2009/07/21 04:01:29 bkorb Exp $ + * Time-stamp: "2009-07-20 20:40:28 bkorb" * * This module's routines will take the currently set options and * store them into an ".rc" file for re-interpretation the next @@ -81,7 +81,8 @@ findDirName( tOptions* pOpts, int* p_free ) { tCC* pzDir; - if (pOpts->specOptIdx.save_opts == 0) + if ( (pOpts->specOptIdx.save_opts == NO_EQUIVALENT) + || (pOpts->specOptIdx.save_opts == 0)) return NULL; pzDir = pOpts->pOptDesc[ pOpts->specOptIdx.save_opts ].optArg.argString; diff --git a/sntp/libopts/value-type.c b/sntp/libopts/value-type.c index 34227b51b..27c010be0 100644 --- a/sntp/libopts/value-type.c +++ b/sntp/libopts/value-type.c @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ #if 0 /* gperf build options: */ @@ -91,9 +91,6 @@ static const value_type_map_t value_type_table[] = }; #ifdef __GNUC__ -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif static inline const value_type_map_t * find_value_type_name (register const char *str, register unsigned int len) diff --git a/sntp/libopts/value-type.h b/sntp/libopts/value-type.h index a3ee4b4ea..4c1747141 100644 --- a/sntp/libopts/value-type.h +++ b/sntp/libopts/value-type.h @@ -1,5 +1,5 @@ /* - * Generated header for gperf generated source Sat May 16 08:16:06 PDT 2009 + * Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009 * This file enumerates the list of names and declares the * procedure for mapping string names to the enum value. */ diff --git a/sntp/libopts/xat-attribute.c b/sntp/libopts/xat-attribute.c index 3b83636fd..85b735fb6 100644 --- a/sntp/libopts/xat-attribute.c +++ b/sntp/libopts/xat-attribute.c @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ #if 0 /* gperf build options: */ @@ -82,9 +82,6 @@ static const xat_attribute_map_t xat_attribute_table[] = }; #ifdef __GNUC__ -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif static inline const xat_attribute_map_t * find_xat_attribute_name (register const char *str, register unsigned int len) diff --git a/sntp/libopts/xat-attribute.h b/sntp/libopts/xat-attribute.h index 5627bc823..0a82a6b18 100644 --- a/sntp/libopts/xat-attribute.h +++ b/sntp/libopts/xat-attribute.h @@ -1,5 +1,5 @@ /* - * Generated header for gperf generated source Sat May 16 08:16:06 PDT 2009 + * Generated header for gperf generated source Mon Jul 20 21:05:28 PDT 2009 * This file enumerates the list of names and declares the * procedure for mapping string names to the enum value. */