[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-681-gb704a70

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b704a70345c60887b39b438cadd29c9d2f08abfd (commit)
       via  e8351d01690f1f06e22827673d700120a94e388e (commit)
       via  4e2ba4659441c6724c26c5b59a054b623c47d7f2 (commit)
      from  203c5567d04f1c925588e54b7c0c1c002219dcaa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b704a70345c60887b39b438cadd29c9d2f08abfd
commit b704a70345c60887b39b438cadd29c9d2f08abfd
Merge: 203c556 e8351d0
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jun 25 19:23:55 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 25 19:23:55 2015 -0400

    Merge topic 'auto_export_dll_symbols' into next
    
    e8351d01 remove warning on borland
    4e2ba465 clean up a bit


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8351d01690f1f06e22827673d700120a94e388e
commit e8351d01690f1f06e22827673d700120a94e388e
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jun 25 18:08:34 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jun 25 18:08:34 2015 -0400

    remove warning on borland

diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 407a815..e94282a 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -186,7 +186,7 @@ HaveExportedObjects(PIMAGE_FILE_HEADER pImageFileHeader,
 void
 DumpExternalsObjects(PIMAGE_SYMBOL pSymbolTable,
                      PIMAGE_SECTION_HEADER pSectionHeaders,
-                     FILE *fout, unsigned cSymbols)
+                     FILE *fout, DWORD_PTR cSymbols)
 {
    unsigned i;
    PSTR stringTable;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e2ba4659441c6724c26c5b59a054b623c47d7f2
commit 4e2ba4659441c6724c26c5b59a054b623c47d7f2
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jun 25 18:04:23 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jun 25 18:04:23 2015 -0400

    clean up a bit

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index bdf3f41..6b9923a 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -34,6 +34,10 @@
 #include <time.h>
 
 #include <stdlib.h> // required for atoi
+#ifdef _WIN32
+// defined in binexplib.cxx
+void DumpFile(const char* filename, FILE *fout);
+#endif
 
 void CMakeCommandUsage(const char* program)
 {
@@ -213,9 +217,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
 #ifdef _WIN32
     else if(args[1] == "__create_def")
       {
-      // defined in binexplib.cxx
-      void
-        DumpFile(const char* filename, FILE *fout);
       if(args.size() < 4)
         {
         std::cerr <<
@@ -240,7 +241,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       std::string objfile;
       while(cmSystemTools::GetLineFromStream(fin, objfile))
         {
-        // needed fort for bzip2 c code with WINAPI calls
         DumpFile(objfile.c_str(), fout);
         }
       return 0;

-----------------------------------------------------------------------

Summary of changes:
 Source/bindexplib.cxx |    2 +-
 Source/cmcmd.cxx      |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake