[Firebird-checkins] SF.net SVN: firebird:[62991] firebird/trunk

[<aa...@us...>]

Revision: 62991
          http://sourceforge.net/p/firebird/code/62991
Author:   aafemt
Date:     2016-02-20 15:34:20 +0000 (Sat, 20 Feb 2016)
Log Message:
-----------
Use autoconfig_msvc.h from where it is

Modified Paths:
--------------
    firebird/trunk/builds/win32/clean_all.bat
    firebird/trunk/builds/win32/make_boot.bat
    firebird/trunk/src/gpre/languages/fbrmclib.cpp
    firebird/trunk/src/include/firebird.h

Modified: firebird/trunk/builds/win32/clean_all.bat
===================================================================
--- firebird/trunk/builds/win32/clean_all.bat	2016-02-20 00:11:24 UTC (rev 62990)
+++ firebird/trunk/builds/win32/clean_all.bat	2016-02-20 15:34:20 UTC (rev 62991)
@@ -44,7 +44,7 @@
 
 if defined FB_CLEAN_SHARED (
 @echo Cleaning shared gen and dsql files...
-@del %FB_ROOT_PATH%\src\include\gen\autoconfig.h 2>nul
+@del %FB_ROOT_PATH%\src\include\gen\parse.h 2>nul
 @del %FB_ROOT_PATH%\src\dsql\dsql.tab.h 2>nul
 @del %FB_ROOT_PATH%\src\dsql\parse.cpp 2>nul
 )

Modified: firebird/trunk/builds/win32/make_boot.bat
===================================================================
--- firebird/trunk/builds/win32/make_boot.bat	2016-02-20 00:11:24 UTC (rev 62990)
+++ firebird/trunk/builds/win32/make_boot.bat	2016-02-20 15:34:20 UTC (rev 62991)
@@ -17,10 +17,6 @@
 ::===========
 :MAIN
 @echo.
-@echo Copy autoconfig.h
-@del %FB_ROOT_PATH%\src\include\gen\autoconfig.h 2> nul
-@copy %FB_ROOT_PATH%\src\include\gen\autoconfig_msvc.h %FB_ROOT_PATH%\src\include\gen\autoconfig.h > nul
-
 @echo Creating directories
 @rmdir /s /q %FB_GEN_DIR% 2>nul
 :: Remove previously generated output, and recreate the directory hierarchy. 

Modified: firebird/trunk/src/gpre/languages/fbrmclib.cpp
===================================================================
--- firebird/trunk/src/gpre/languages/fbrmclib.cpp	2016-02-20 00:11:24 UTC (rev 62990)
+++ firebird/trunk/src/gpre/languages/fbrmclib.cpp	2016-02-20 15:34:20 UTC (rev 62991)
@@ -40,7 +40,11 @@
 #include <math.h>
 #include <crtdbg.h>
 
+#ifdef _MSC_VER
+#include "autoconfig_msvc.h"
+#else
 #include "autoconfig.h"
+#endif
 #include "fb_types.h"
 #include "../jrd/ibase.h"
 

Modified: firebird/trunk/src/include/firebird.h
===================================================================
--- firebird/trunk/src/include/firebird.h	2016-02-20 00:11:24 UTC (rev 62990)
+++ firebird/trunk/src/include/firebird.h	2016-02-20 15:34:20 UTC (rev 62991)
@@ -32,7 +32,11 @@
 #ifndef INCLUDE_Firebird_H
 #define INCLUDE_Firebird_H
 
+#ifdef _MSC_VER
+#include "gen/autoconfig_msvc.h"
+#else
 #include "gen/autoconfig.h"
+#endif
 
 // Using our debugging code is pointless when we may use Valgrind features
 #if defined(DEV_BUILD) && !defined(USE_VALGRIND)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.