Re: CVS: commit sum1 abi/src/wp/ap/xp ap_Dialog_Options.h

Hi Sum1,

I am really sorry about this; gcc considers undefined symbols in the #if
constructs to == 0, but seems from your build breakage that this is not
portable. I need to go through all of these statements again and prefix
them with defined() test. :-(

Tomas

cvs@abisource.com wrote:
> Update of /cvsroot/abi/src/wp/ap/xp
> In directory abiword.snt.utwente.nl:/tmp/cvs-serv17046
>
> Modified Files:
> ap_Dialog_Options.h
> Log Message:
> Fix the MinGW build (id_SHOWSPLASH wasn't being defined).
>
>
>
>
> Index: ap_Dialog_Options.h
> ===================================================================
> RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_Options.h,v
> retrieving revision 1.55
> retrieving revision 1.56
> diff -u -d -r1.55 -r1.56
> --- ap_Dialog_Options.h 27 Jan 2007 18:06:03 -0000 1.55
> +++ ap_Dialog_Options.h 27 Jan 2007 18:52:30 -0000 1.56
> @@ -70,7 +70,7 @@
> id_PUSH_CHOOSE_COLOR_FOR_TRANSPARENT,
> id_BUTTON_SAVE, id_BUTTON_DEFAULTS,
> id_BUTTON_OK, id_BUTTON_CANCEL, id_BUTTON_APPLY,
> -#if EMBEDDED_TARGET != EMBEDDED_TARGET_HILDON
> +#if (EMBEDDED_TARGET != EMBEDDED_TARGET_HILDON) || defined(WIN32)
> id_SHOWSPLASH,
> #endif
> id_CHECK_ALLOW_CUSTOM_TOOLBARS,
> @@ -133,7 +133,7 @@
> SET_GATHER (SpellUppercase, bool);
> SET_GATHER (SpellNumbers, bool);
> SET_GATHER (GrammarCheck, bool);
> -#if EMBEDDED_TARGET != EMBEDDED_TARGET_HILDON
> +#if (EMBEDDED_TARGET != EMBEDDED_TARGET_HILDON) || defined(WIN32)
> SET_GATHER (ShowSplash,bool);
> #endif
> SET_GATHER (PrefsAutoSave, bool);
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
>
Received on Sat Jan 27 20:28:08 2007