move includes outside #ifdef for precompiled-header love, also PR_EXTERN_C

xpcom/libxpt/public/xpt_struct.h

@@ -21,10 +21,12 @@
  * http://www.mozilla.org/scriptable/typelib_file.html
  */
 
+#include "prtypes.h"
+
 #ifndef __xpt_struct_h__
 #define __xpt_struct_h__
 
-#include "prtypes.h"
+PR_BEGIN_EXTERN_C
 
 /*
  * Originally, I was going to have structures that exactly matched the on-disk
@@ -115,7 +117,7 @@ XPT_SizeOfHeaderBlock(XPTHeader *header);
 struct XPTInterfaceDirectoryEntry {
     nsID                   iid;
     char                   *name;
-    char                   *namespace;
+    char                   *name_space;
     XPTInterfaceDescriptor *interface_descriptor;
 #if 0 /* not yet */
     /* not stored on disk */
@@ -125,7 +127,7 @@ struct XPTInterfaceDirectoryEntry {
 
 PRBool
 XPT_FillInterfaceDirectoryEntry(XPTInterfaceDirectoryEntry *ide,
-                                nsID *iid, char *name, char *namespace,
+                                nsID *iid, char *name, char *name_space,
                                 XPTInterfaceDescriptor *descriptor);
 
 /*
@@ -407,4 +409,6 @@ struct XPTAnnotation {
 XPTAnnotation *
 XPT_NewAnnotation(uint8 flags, XPTString *creator, XPTString *private_data);
 
+PR_END_EXTERN_C
+
 #endif /* __xpt_struct_h__ */

xpcom/libxpt/public/xpt_xdr.h

@@ -20,14 +20,16 @@
  * Basic APIs for streaming typelib structures to/from disk.
  */
 
-#ifndef __xpt_xdr_h__
-#define __xpt_xdr_h__
-
 #include <nspr.h>
 #include <plhash.h>
 #include <prmem.h>
 #include "xpt_struct.h"
 
+#ifndef __xpt_xdr_h__
+#define __xpt_xdr_h__
+
+PR_BEGIN_EXTERN_C
+
 typedef struct XPTState         XPTState;
 typedef struct XPTDatapool      XPTDatapool;
 typedef struct XPTCursor        XPTCursor;
@@ -207,4 +209,6 @@ XPT_GetAddrForOffset(XPTCursor *cursor, uint32 offset);
     return PR_FALSE;
 
 
+PR_END_EXTERN_C
+
 #endif /* __xpt_xdr_h__ */

xpcom/typelib/xpt/public/xpt_struct.h

@@ -21,10 +21,12 @@
  * http://www.mozilla.org/scriptable/typelib_file.html
  */
 
+#include "prtypes.h"
+
 #ifndef __xpt_struct_h__
 #define __xpt_struct_h__
 
-#include "prtypes.h"
+PR_BEGIN_EXTERN_C
 
 /*
  * Originally, I was going to have structures that exactly matched the on-disk
@@ -115,7 +117,7 @@ XPT_SizeOfHeaderBlock(XPTHeader *header);
 struct XPTInterfaceDirectoryEntry {
     nsID                   iid;
     char                   *name;
-    char                   *namespace;
+    char                   *name_space;
     XPTInterfaceDescriptor *interface_descriptor;
 #if 0 /* not yet */
     /* not stored on disk */
@@ -125,7 +127,7 @@ struct XPTInterfaceDirectoryEntry {
 
 PRBool
 XPT_FillInterfaceDirectoryEntry(XPTInterfaceDirectoryEntry *ide,
-                                nsID *iid, char *name, char *namespace,
+                                nsID *iid, char *name, char *name_space,
                                 XPTInterfaceDescriptor *descriptor);
 
 /*
@@ -407,4 +409,6 @@ struct XPTAnnotation {
 XPTAnnotation *
 XPT_NewAnnotation(uint8 flags, XPTString *creator, XPTString *private_data);
 
+PR_END_EXTERN_C
+
 #endif /* __xpt_struct_h__ */

xpcom/typelib/xpt/public/xpt_xdr.h

@@ -20,14 +20,16 @@
  * Basic APIs for streaming typelib structures to/from disk.
  */
 
-#ifndef __xpt_xdr_h__
-#define __xpt_xdr_h__
-
 #include <nspr.h>
 #include <plhash.h>
 #include <prmem.h>
 #include "xpt_struct.h"
 
+#ifndef __xpt_xdr_h__
+#define __xpt_xdr_h__
+
+PR_BEGIN_EXTERN_C
+
 typedef struct XPTState         XPTState;
 typedef struct XPTDatapool      XPTDatapool;
 typedef struct XPTCursor        XPTCursor;
@@ -207,4 +209,6 @@ XPT_GetAddrForOffset(XPTCursor *cursor, uint32 offset);
     return PR_FALSE;
 
 
+PR_END_EXTERN_C
+
 #endif /* __xpt_xdr_h__ */