Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 18:55:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1438257, part 4 - Remove duplicate definition of nsID.h. r=froydnj

Browse Source 
Now that this file is all C++, we don't need to duplicate it.

MozReview-Commit-ID: 8nlcGLMnuzV

--HG--
extra : rebase_source : 3fcc2ccd05547de4388f917588d81135b6eb57a8
This commit is contained in:
Andrew McCreight 2018-02-14 10:18:36 -08:00
parent 5f1356669e
commit 6d7249fb24
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xpcom/typelib/xpt/xpt_struct.h
View File

@ -12,6 +12,7 @@
#define __xpt_struct_h__
#include "xpt_arena.h"
#include "nsID.h"
#include <stdint.h>
/*
@ -34,22 +35,6 @@ struct XPTParamDescriptor;
struct XPTTypeDescriptor;
struct XPTTypeDescriptorPrefix;
#ifndef nsID_h__
/*
* We can't include nsID.h, because it's full of C++ goop and we're not doing
* C++ here, so we define our own minimal struct. We protect against multiple
* definitions of this struct, though, and use the same field naming.
*/
struct nsID {
uint32_t m0;
uint16_t m1;
uint16_t m2;
uint8_t m3[8];
};
typedef struct nsID nsID;
#endif
/*
* Every XPCOM typelib file begins with a header.
*/