r24098 by jghali - Fix compiler warning caused by header conflict between scribus' crypt.h and system <crypt.h> included by Python headers

scribus-commit scribus-commit at lists.scribus.net
Sat Oct 24 19:39:32 UTC 2020 

Author: jghali
Date: Sat Oct 24 19:39:32 2020
New Revision: 24098

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24098
Log:
Fix compiler warning caused by header conflict between scribus' crypt.h and system <crypt.h> included by Python headers

Added:
    branches/Version14x/Scribus/scribus/unzip_crypt.h
      - copied unchanged from r24097, branches/Version14x/Scribus/scribus/crypt.h
Modified:
    branches/Version14x/Scribus/Scribus.pro
    branches/Version14x/Scribus/scribus/crypt.h
    branches/Version14x/Scribus/scribus/unzip.c
    branches/Version14x/Scribus/win32/msvc2008/scribus-exe/scribus.vcproj
    branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj
    branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj.filters
    branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj
    branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj.filters
    branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj
    branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj.filters

Modified: branches/Version14x/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/Scribus.pro
==============================================================================
--- branches/Version14x/Scribus/Scribus.pro	(original)
+++ branches/Version14x/Scribus/Scribus.pro	Sat Oct 24 19:39:32 2020
@@ -264,7 +264,6 @@
            scribus/commonstrings.h \
            scribus/contextmenu.h \
            scribus/cpalette.h \
-           scribus/crypt.h \
            scribus/cupsoptions.h \
            scribus/curvewidget.h \
            scribus/customfdialog.h \
@@ -544,6 +543,7 @@
            scribus/unicodesearch.h \
            scribus/units.h \
            scribus/unzip.h \
+           scribus/unzip_crypt.h \
            scribus/updatemanager.h \
            scribus/upgradechecker.h \
            scribus/urllauncher.h \

Modified: branches/Version14x/Scribus/scribus/unzip.c
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/scribus/unzip.c
==============================================================================
--- branches/Version14x/Scribus/scribus/unzip.c	(original)
+++ branches/Version14x/Scribus/scribus/unzip.c	Sat Oct 24 19:39:32 2020
@@ -154,7 +154,7 @@
 
 
 #ifndef NOUNCRYPT
-#include "crypt.h"
+#include "unzip_crypt.h"
 #endif
 
 /* ===========================================================================

Modified: branches/Version14x/Scribus/win32/msvc2008/scribus-exe/scribus.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/win32/msvc2008/scribus-exe/scribus.vcproj
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2008/scribus-exe/scribus.vcproj	(original)
+++ branches/Version14x/Scribus/win32/msvc2008/scribus-exe/scribus.vcproj	Sat Oct 24 19:39:32 2020
@@ -2592,22 +2592,6 @@
 			<File
 				RelativePath="..\..\..\scribus\color.h"
 				>
-				<FileConfiguration
-					Name="Debug-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						AdditionalDependencies=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						AdditionalDependencies=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\scribus\colorblind.h"
@@ -2794,26 +2778,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\scribus\crypt.h"
-				>
-				<FileConfiguration
-					Name="Debug-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						AdditionalDependencies=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						AdditionalDependencies=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\..\..\scribus\cupsoptions.h"
 				>
 				<FileConfiguration
@@ -4936,28 +4900,6 @@
 			<File
 				RelativePath="..\..\..\scribus\scdocoutput_ps2.h"
 				>
-				<FileConfiguration
-					Name="Debug-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Étape de génération personnalisée en cours"
-						CommandLine=""
-						AdditionalDependencies=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Étape de génération personnalisée en cours"
-						CommandLine=""
-						AdditionalDependencies=""
-						Outputs=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\scribus\scescapecatcher.h"
@@ -5120,28 +5062,6 @@
 			<File
 				RelativePath="..\..\..\scribus\sclayer.h"
 				>
-				<FileConfiguration
-					Name="Debug-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Étape de génération personnalisée en cours"
-						CommandLine=""
-						AdditionalDependencies=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Étape de génération personnalisée en cours"
-						CommandLine=""
-						AdditionalDependencies=""
-						Outputs=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\scribus\sclimits.h"
@@ -5438,28 +5358,6 @@
 			<File
 				RelativePath="..\..\..\scribus\scribusXml.h"
 				>
-				<FileConfiguration
-					Name="Debug-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Étape de génération personnalisée en cours"
-						CommandLine=""
-						AdditionalDependencies=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Étape de génération personnalisée en cours"
-						CommandLine=""
-						AdditionalDependencies=""
-						Outputs=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\scribus\scrpalettebase.h"
@@ -6494,28 +6392,6 @@
 			<File
 				RelativePath="..\..\..\scribus\tt\simpletreemodel\treeitem.h"
 				>
-				<FileConfiguration
-					Name="Debug-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Étape de génération personnalisée en cours"
-						CommandLine=""
-						AdditionalDependencies=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Étape de génération personnalisée en cours"
-						CommandLine=""
-						AdditionalDependencies=""
-						Outputs=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\scribus\tt\simpletreemodel\treemodel.h"
@@ -6607,6 +6483,10 @@
 			</File>
 			<File
 				RelativePath="..\..\..\scribus\unzip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\scribus\unzip_crypt.h"
 				>
 			</File>
 			<File

Modified: branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj	(original)
+++ branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj	Sat Oct 24 19:39:32 2020
@@ -313,7 +313,7 @@
     <moc Include="..\..\..\scribus\cmsprefs.h" />
     <moc Include="..\..\..\scribus\cmykfw.h" />
     <moc Include="..\..\..\scribus\collect4output.h" />
-    <CustomBuild Include="..\..\..\scribus\color.h" />
+    <ClInclude Include="..\..\..\scribus\color.h" />
     <moc Include="..\..\..\scribus\colorblind.h" />
     <moc Include="..\..\..\scribus\colorchart.h" />
     <moc Include="..\..\..\scribus\colorcombo.h" />
@@ -325,7 +325,7 @@
     <moc Include="..\..\..\scribus\ui\copypagetomasterpagedialog.h" />
     <moc Include="..\..\..\scribus\cpalette.h" />
     <moc Include="..\..\..\scribus\ui\createrange.h" />
-    <CustomBuild Include="..\..\..\scribus\crypt.h" />
+    <ClInclude Include="..\..\..\scribus\unzip_crypt.h" />
     <moc Include="..\..\..\scribus\cupsoptions.h" />
     <moc Include="..\..\..\scribus\curvewidget.h" />
     <moc Include="..\..\..\scribus\customfdialog.h" />

Modified: branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj.filters
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj.filters	(original)
+++ branches/Version14x/Scribus/win32/msvc2012/scribus-exe/scribus.vcxproj.filters	Sat Oct 24 19:39:32 2020
@@ -701,6 +701,12 @@
     <ClInclude Include="..\..\..\scribus\tt\simpletreemodel\treeitem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\scribus\color.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\unzip_crypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2826,12 +2832,4 @@
       <Filter>Header Files</Filter>
     </moc>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\scribus\color.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\scribus\crypt.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>

Modified: branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj	(original)
+++ branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj	Sat Oct 24 19:39:32 2020
@@ -313,7 +313,7 @@
     <moc Include="..\..\..\scribus\cmsprefs.h" />
     <moc Include="..\..\..\scribus\cmykfw.h" />
     <moc Include="..\..\..\scribus\collect4output.h" />
-    <CustomBuild Include="..\..\..\scribus\color.h" />
+    <ClInclude Include="..\..\..\scribus\color.h" />
     <moc Include="..\..\..\scribus\colorblind.h" />
     <moc Include="..\..\..\scribus\colorchart.h" />
     <moc Include="..\..\..\scribus\colorcombo.h" />
@@ -325,7 +325,7 @@
     <moc Include="..\..\..\scribus\ui\copypagetomasterpagedialog.h" />
     <moc Include="..\..\..\scribus\cpalette.h" />
     <moc Include="..\..\..\scribus\ui\createrange.h" />
-    <CustomBuild Include="..\..\..\scribus\crypt.h" />
+    <ClInclude Include="..\..\..\scribus\unzip_crypt.h" />
     <moc Include="..\..\..\scribus\cupsoptions.h" />
     <moc Include="..\..\..\scribus\curvewidget.h" />
     <moc Include="..\..\..\scribus\customfdialog.h" />

Modified: branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj.filters
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj.filters	(original)
+++ branches/Version14x/Scribus/win32/msvc2013/scribus-exe/scribus.vcxproj.filters	Sat Oct 24 19:39:32 2020
@@ -701,6 +701,12 @@
     <ClInclude Include="..\..\..\scribus\tt\simpletreemodel\treeitem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\scribus\color.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\unzip_crypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2826,12 +2832,4 @@
       <Filter>Header Files</Filter>
     </moc>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\scribus\color.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\scribus\crypt.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>

Modified: branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj	(original)
+++ branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj	Sat Oct 24 19:39:32 2020
@@ -313,7 +313,7 @@
     <moc Include="..\..\..\scribus\cmsprefs.h" />
     <moc Include="..\..\..\scribus\cmykfw.h" />
     <moc Include="..\..\..\scribus\collect4output.h" />
-    <CustomBuild Include="..\..\..\scribus\color.h" />
+    <ClInclude Include="..\..\..\scribus\color.h" />
     <moc Include="..\..\..\scribus\colorblind.h" />
     <moc Include="..\..\..\scribus\colorchart.h" />
     <moc Include="..\..\..\scribus\colorcombo.h" />
@@ -325,7 +325,7 @@
     <moc Include="..\..\..\scribus\ui\copypagetomasterpagedialog.h" />
     <moc Include="..\..\..\scribus\cpalette.h" />
     <moc Include="..\..\..\scribus\ui\createrange.h" />
-    <CustomBuild Include="..\..\..\scribus\crypt.h" />
+    <ClInclude Include="..\..\..\scribus\unzip_crypt.h" />
     <moc Include="..\..\..\scribus\cupsoptions.h" />
     <moc Include="..\..\..\scribus\curvewidget.h" />
     <moc Include="..\..\..\scribus\customfdialog.h" />

Modified: branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24098&path=/branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj.filters
==============================================================================
--- branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj.filters	(original)
+++ branches/Version14x/Scribus/win32/msvc2015/scribus-exe/scribus.vcxproj.filters	Sat Oct 24 19:39:32 2020
@@ -701,6 +701,12 @@
     <ClInclude Include="..\..\..\scribus\tt\simpletreemodel\treeitem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\scribus\color.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\unzip_crypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2826,12 +2832,4 @@
       <Filter>Header Files</Filter>
     </moc>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\scribus\color.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\scribus\crypt.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>

More information about the scribus-commit mailing list