diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-04-19 22:28:56 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-04-20 05:26:05 +0000 |
| commit | fc0d494b8936ab11abca761810de8a03f579edf5 (patch) | |
| tree | 994c79d2a6565d1dc5084ac5e64f3f5d828a6aa3 /rsc/inc | |
| parent | d68cf40b7a16e20e99c15d310b24c91c2ca89ef6 (diff) | |
rsc crash on WIN64 due to LP64
rsc stash stuff in a 'value' filed that was defined as 'long'
saddly it stash also pointer there... which on WIN64 truncate 64 bits
pointers in 32 bits scalar.
That went unnoticed for years because on every other platform
sizeof(long) = sizeof(void*)
Change-Id: I218ae181c9d6b64ade457ee49942d1d07a933bb7
Reviewed-on: https://gerrit.libreoffice.org/15394
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'rsc/inc')
| -rw-r--r-- | rsc/inc/rsckey.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx index 099b20cef580..92df3ce70bfd 100644 --- a/rsc/inc/rsckey.hxx +++ b/rsc/inc/rsckey.hxx @@ -28,7 +28,7 @@ typedef struct { Atom nName; sal_uInt32 nTyp; - long yylval; + sal_IntPtr yylval; } KEY_STRUCT; class RscNameTable @@ -40,8 +40,8 @@ public: RscNameTable(); ~RscNameTable(); void SetSort( bool bSorted = true ); - Atom Put( Atom nName, sal_uInt32 nTyp, long nValue ); - Atom Put( const char * pName, sal_uInt32 nTyp, long nValue ); + Atom Put( Atom nName, sal_uInt32 nTyp, sal_IntPtr nValue ); + Atom Put( const char * pName, sal_uInt32 nTyp, sal_IntPtr nValue ); Atom Put( const char * pName, sal_uInt32 nTyp ); Atom Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass ); |