diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-04-01 13:55:00 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-01 13:55:00 -0400 |
| commit | ce3979c721ba378a448bfbe3671c99d993cbc801 (patch) | |
| tree | e200d5225bcecef5f974b946a58277fddd24e89c /ipc | |
| parent | f6c16cff36048c583ca0e1d019b622336ca861a0 (diff) | |
| parent | ff2f287f82630ab3887d7d5c1e64e5b888ea0beb (diff) | |
| download | UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.gz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.lz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.xz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/glue/GeckoChildProcessHost.cpp | 2 | ||||
| -rw-r--r-- | ipc/glue/moz.build | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp index 8147e87dc..fee429238 100644 --- a/ipc/glue/GeckoChildProcessHost.cpp +++ b/ipc/glue/GeckoChildProcessHost.cpp @@ -23,8 +23,6 @@ #include "prenv.h" #include "nsXPCOMPrivate.h" -#include "nsExceptionHandler.h" - #include "nsDirectoryServiceDefs.h" #include "nsIFile.h" #include "nsPrintfCString.h" diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index d0d9f9937..85d7f8fa0 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -177,7 +177,6 @@ IPDL_SOURCES = [ LOCAL_INCLUDES += [ '/dom/ipc', - '/toolkit/crashreporter', '/toolkit/xre', '/xpcom/threads', ] |