From 4fd18c3c1675d30fb5e7c82c1a5143bbad173703 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Mon, 23 Nov 2020 18:28:01 +0000 Subject: [PATCH] dtstyle: Remove duplicate definition of NumOfPalettes that was a) wrong b) causing issues on recent compilers --- cde/programs/dtstyle/ColorFile.c | 2 -- cde/programs/dtstyle/ColorMain.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cde/programs/dtstyle/ColorFile.c b/cde/programs/dtstyle/ColorFile.c index 28bc4287c..2a2e4b05a 100644 --- a/cde/programs/dtstyle/ColorFile.c +++ b/cde/programs/dtstyle/ColorFile.c @@ -125,8 +125,6 @@ static void InitializeBW( /*+++++++++++++++++++++++++++++++++++++++*/ /* Internal Variables */ /*+++++++++++++++++++++++++++++++++++++++*/ -int NumOfPalettes = 0; - static char *PALETTE_DIR = CDE_INSTALLATION_TOP "/palettes/"; static char *PALETTE_DIR_ADM = "/etc/dt/palettes/"; static char *DEFAULT_FILENAME = "palette.dt"; diff --git a/cde/programs/dtstyle/ColorMain.c b/cde/programs/dtstyle/ColorMain.c index 811c6c725..05b4b4c10 100644 --- a/cde/programs/dtstyle/ColorMain.c +++ b/cde/programs/dtstyle/ColorMain.c @@ -246,7 +246,7 @@ Widget paletteList; Widget deleteButton; char *defaultName; Bool WaitSelection; -int NumOfPalettes; +int NumOfPalettes = 0; /*+++++++++++++++++++++++++++++++++++++++*/ /* Internal Variables */