Fix Windows compilation after https://codereview.scilab.org/#/c/13012/ 67/13067/4
Vincent COUVERT [Mon, 4 Nov 2013 09:00:34 +0000 (10:00 +0100)]
Bring back stack.h as stack.h.in even if there is no changes

Change-Id: I8e83a1e21ea8ac66a0fbdeca397f89aabe2da6c3

scilab/configure
scilab/configure.ac
scilab/modules/core/includes/stack.h.in [moved from scilab/modules/core/includes/stack.h with 100% similarity]
scilab/modules/core/includes/stack.h.vc
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters

index 20447be..d101d29 100755 (executable)
@@ -40347,6 +40347,8 @@ fi
 # This script is used by Xcos in order to regenerate the function/block list
 
 
+cp $srcdir/modules/core/includes/stack.h.in $srcdir/modules/core/includes/stack.h
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
index f23181b..0d6a0f1 100644 (file)
@@ -1955,6 +1955,8 @@ fi
 # This script is used by Xcos in order to regenerate the function/block list
 AC_CONFIG_COMMANDS_POST([chmod +x $SCI_SRCDIR_FULL/modules/scicos_blocks/src/scripts/GenBlocks.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/scicompile.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/compilerDetection.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/configure])
 
+cp $srcdir/modules/core/includes/stack.h.in $srcdir/modules/core/includes/stack.h
+
 AC_OUTPUT
 
 # To distribution packager, you can uncomment this stuff is you want to
index 24ceea7..73a73c0 100644 (file)
@@ -60,7 +60,7 @@ c
       integer icall,krec
       common /recu/ ids,pstk,rstk,pt,niv,macr,paus,icall,krec
 
-      integer ddt,err,lct(8),lin(lsiz),lpt(6),hio,rio,rte,wte
+      integer ddt,err,lct(8),lin(lsiz),lpt(6),rio,rte,wte
       common /iop/ ddt,err,lct,lin,lpt,rio,rte,wte
 
       integer err1,err2,errct,toperr,errpt,ieee,catch
@@ -85,4 +85,3 @@ c
       common/intersci/nbvars,iwhere,nbrows,nbcols,
      $ itflag,ntypes,lad,ladc,lhsvar
 c*------------------------------------------------------------------
-
index 3f14135..e9d6ace 100644 (file)
@@ -474,7 +474,6 @@ cd ..
     <ClInclude Include="..\..\includes\SetScilabEnvironment.h" />
     <ClInclude Include="..\..\includes\stack-c.h" />
     <ClInclude Include="..\..\includes\stack-def.h" />
-    <ClInclude Include="..\..\includes\stack.h" />
     <ClInclude Include="..\..\includes\stack1.h" />
     <ClInclude Include="..\..\includes\stack2.h" />
     <ClInclude Include="..\..\includes\stack3.h" />
index 4a79f70..d5d666c 100644 (file)
     <ClInclude Include="..\..\includes\stack-def.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\stack.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\includes\stack1.h">
       <Filter>Header Files</Filter>
     </ClInclude>