Merge of DMD 2.062.

dmd2/module.h

@@ -81,9 +81,6 @@ struct Module : Package
     unsigned numlines;  // number of lines in source file
     int isDocFile;      // if it is a documentation input file, not D source
     int needmoduleinfo;
-#ifdef IN_GCC
-    int strictlyneedmoduleinfo;
-#endif
 
     int selfimports;            // 0: don't know, 1: does not, 2: does
     int selfImports();          // returns !=0 if module imports itself
@@ -132,9 +129,11 @@ struct Module : Package
     static Module *load(Loc loc, Identifiers *packages, Identifier *ident);
 
     void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    void toJsonBuffer(OutBuffer *buf);
+    void toJson(JsonOut *json);
+    void jsonProperties(JsonOut *json);
     const char *kind();
 #if !IN_LLVM
+    File *setOutfile(const char *name, const char *dir, const char *arg, const char *ext);
     void setDocfile();  // set docfile member
 #endif
     bool read(Loc loc); // read file, returns 'true' if succeed, 'false' otherwise.
@@ -148,9 +147,6 @@ struct Module : Package
     void semantic2(Scope* unused_sc = NULL);   // pass 2 semantic analysis
     void semantic3(Scope* unused_sc = NULL);   // pass 3 semantic analysis
     void inlineScan();  // scan for functions to inline
-#if !IN_LLVM
-    void setHdrfile();  // set hdrfile member
-#endif
     void genhdrfile();  // generate D import file
 //    void gensymfile();
     void gendocfile();