788014 - Reduce inclusions of prtypes.h in the tree to help using standard int types

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Mark Banner (:standard8)]

Attachment: Partial patch

Following on from bug 579517 comment 59 and 60 we should try and reduce the amount of prtypes.h included in the tree to give less opportunities for using the old NSPR types.

Attached is a starter patch for this that doesn't compile yet. The basic idea is to remove prtypes.h from nscore.h and deal with the fallout from that. We should also look at removing prtypes.h from other .h files where we can.

I'm not going to be able to spend time any time on this for the next few weeks, so if someone wants to pick it up, that would be great.

Comment 1

[(no longer active)]

Attachment: Compiles on Linux and Mac!

Comment 2

[(no longer active)]

Attachment: Sort of compiles on Windows too

Comment 3

[(no longer active)]

Attachment: Part 1: declare nsrefcnt to be unsigned long on Windows, always

Please see the commit message on why this is needed and why the change is correct.

Comment 4

[(no longer active)]

Attachment: Reduce inclusions of prtypes.h

Comment 5

[(no longer active)]

Attachment: Reduce inclusions of prtypes.h

Comment 6

[(no longer active)]

Attachment: Reduce inclusions of prtypes.h

Comment 7

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 659340 [details] [diff] [review]
Reduce inclusions of prtypes.h

Review of attachment 659340 [details] [diff] [review]:
-----------------------------------------------------------------

::: xpcom/string/public/nsXPCOMStrings.h
@@ +297,1 @@
>  

Replace them all

Comment 8

[(no longer active)]

Attachment: Updated patch

Comment 9

[(no longer active)]

https://tbpl.mozilla.org/?tree=Try&rev=ea6413b99189

Comment 10

[(no longer active)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/949f2a6459c8
https://hg.mozilla.org/integration/mozilla-inbound/rev/b606f6903196

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/949f2a6459c8
https://hg.mozilla.org/mozilla-central/rev/b606f6903196

Comment 12

[Philip Chee]

make.py[2]: Entering directory 'c:\t1\hg\objdir-sm\mozilla\xpcom\glue'
nsVersionComparator.cpp
c:\t1\hg\comm-central\mozilla\config\rules.mk:993:0$ cl InvokeClWithDependencyGeneration cl -FonsVersionComparator.obj -c -D_HAS_EXCEPTIONS=0 -I../../dist/stl_wrappers  -DMOZ_SUITE=1 -D_USE_ANSI_CPP -DTARGET_XPCOM_ABI=\"x86-msvc\" -Ic:/t1/hg/comm-central/mozilla/xpcom/glue/../build  -Ic:/t1/hg/comm-central/mozilla/xpcom/glue -I. -I../../dist/include  -Ic:/t1/hg/objdir-sm/mozilla/dist/include/nspr -Ic:/t1/hg/objdir-sm/mozilla/dist/include/nss        -TP -nologo -W3 -Gy -Fdgenerated.pdb -wd4800 -we4553 -GR-  -DNDEBUG -DTRIMMED -Zi -UDEBUG -DNDEBUG -O1 -Oy -MD            -FI ../../dist/include/mozilla-config.h -DMOZILLA_CLIENT -Zl c:/t1/hg/comm-central/mozilla/xpcom/glue/nsVersionComparator.cpp

nsVersionComparator.cpp
c:/t1/hg/comm-central/mozilla/xpcom/glue/nsVersionComparator.cpp(9) : fatal error C1083: Cannot open include file: 'stdint.h': No such file or directory

Comment 13

[Philip Chee]

Instead of:
  #include <stdint.h>
Perhaps you could use:
  #include <mozilla/StandardInteger.h>

Comment 14

[Bill Gianopoulos [:WG9s]]

(In reply to Philip Chee from comment #12)
> make.py[2]: Entering directory 'c:\t1\hg\objdir-sm\mozilla\xpcom\glue'
> nsVersionComparator.cpp
> c:\t1\hg\comm-central\mozilla\config\rules.mk:993:0$ cl
> InvokeClWithDependencyGeneration cl -FonsVersionComparator.obj -c
> -D_HAS_EXCEPTIONS=0 -I../../dist/stl_wrappers  -DMOZ_SUITE=1 -D_USE_ANSI_CPP
> -DTARGET_XPCOM_ABI=\"x86-msvc\"
> -Ic:/t1/hg/comm-central/mozilla/xpcom/glue/../build 
> -Ic:/t1/hg/comm-central/mozilla/xpcom/glue -I. -I../../dist/include 
> -Ic:/t1/hg/objdir-sm/mozilla/dist/include/nspr
> -Ic:/t1/hg/objdir-sm/mozilla/dist/include/nss        -TP -nologo -W3 -Gy
> -Fdgenerated.pdb -wd4800 -we4553 -GR-  -DNDEBUG -DTRIMMED -Zi -UDEBUG
> -DNDEBUG -O1 -Oy -MD            -FI ../../dist/include/mozilla-config.h
> -DMOZILLA_CLIENT -Zl
> c:/t1/hg/comm-central/mozilla/xpcom/glue/nsVersionComparator.cpp
> 
> nsVersionComparator.cpp
> c:/t1/hg/comm-central/mozilla/xpcom/glue/nsVersionComparator.cpp(9) : fatal
> error C1083: Cannot open include file: 'stdint.h': No such file or directory

I filed bug 789711 on this issue.

Comment 15

[(no longer active)]

Sorry for the breakage.  Landed a fix on inbound.