724485 - don't typedef long intptr_t if _MSC_VER >= 1400

Status: RESOLVED FIXED

(Calendar :: General, defect)

Description

[Makoto Kato [:m_kato]]

VS2005 has intptr_t.  So we cannot build for Win64 binary.


c:/mozilla-build/python/python2.7.exe -O c:/Workspace/hg.mozilla.org/comm-releas
e/mozilla/build/cl.py cl -Foicalrecur.obj -c  -DHAVE_CONFIG_H -DMOZ_THUNDERBIRD=
1 -DOSTYPE=\"WINNT6.0\" -DOSARCH=WINNT -I/c/Workspace/hg.mozilla.org/comm-releas
e/calendar/libical/src/libical/../.. -I/c/Workspace/hg.mozilla.org/comm-release/
calendar/libical/src/libical -I. -I/c/Workspace/hg.mozilla.org/comm-release/cale
ndar/libical/src/libical -I. -I../../../../mozilla/dist/include -I../../../../mo
zilla/dist/include/nsprpub  -Ic:/Workspace/hg.mozilla.org/objdir-calrel/mozilla/
dist/include/nspr -Ic:/Workspace/hg.mozilla.org/objdir-calrel/mozilla/dist/inclu
de/nss        -TC -nologo -W3 -Gy -Fdgenerated.pdb  -DNDEBUG -DTRIMMED -Zi -Zi -
UDEBUG -DNDEBUG -O1 -Oy -MT            -FI ../../../../comm-config.h -DMOZILLA_C
LIENT /c/Workspace/hg.mozilla.org/comm-release/calendar/libical/src/libical/ical
recur.c
icalrecur.c
c:/Workspace/hg.mozilla.org/comm-release/calendar/libical/src/libical/icalrecur.
c(151) : error C2371: 'intptr_t' : redefinition; different basic types
        c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\crtdefs.h
(416) : see declaration of 'intptr_t'
make[1]: *** [icalrecur.obj] Error 2
make[1]: Leaving directory `/c/Workspace/hg.mozilla.org/objdir-calrel/calendar/l
ibical/src/libical'
make: *** [all] Error 2

Comment 1

[Makoto Kato [:m_kato]]

Attachment: fix

Comment 2

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 594657 [details] [diff] [review]
fix

r=philipp

We should check if this fix has also made it upstream

Comment 3

[Felix Möller]

Upstream for this is at http://freeassociation.svn.sourceforge.net/viewvc/freeassociation/trunk/libical/src/libical/icalrecur.c?revision=1113&view=markup which does not have the patch applied yet.

Comment 4

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Pushed to comm-central changeset 0dd576f063aa