Commit 17d45dec authored by Richard Levitte's avatar Richard Levitte Committed by Richard Levitte
Browse files

Make sure that disabling the MAYLOSEDATA3 warning is only done when the... 


Make sure that disabling the MAYLOSEDATA3 warning is only done when the compiler supports it. Otherwise, there are warnings about it lacking everywhere, which is quite tedious to read through while trying to check for other warnings.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 6bfe5538

apps/makeapps.com

+18 −3
Original line number Diff line number Diff line
@@ -773,9 +773,12 @@ $ CCDEFS = "MONOLITH" 
$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS

$ CCEXTRAFLAGS = ""

$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS

$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"

$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -

	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS

$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"

$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. ""

$ THEN

$     IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + ","

$     CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS

$ ENDIF

$!

$! Check To See If We Have A ZLIB Option.

$!
@@ -1064,6 +1067,18 @@ $! Finish up the definition of CC. 
$!

$ IF COMPILER .EQS. "DECC"

$ THEN

$!  Not all compiler versions support MAYLOSEDATA3.

$   OPT_TEST = "MAYLOSEDATA3"

$   DEFINE /USER_MODE SYS$ERROR NL:

$   DEFINE /USER_MODE SYS$OUTPUT NL:

$   'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT -

      /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL:

$   IF ($SEVERITY)

$   THEN

$     IF CCDISABLEWARNINGS .NES. "" THEN -

        CCDISABLEWARNINGS = CCDISABLEWARNINGS+ ","

$     CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST

$   ENDIF

$   IF CCDISABLEWARNINGS .NES. ""

$   THEN

$     CCDISABLEWARNINGS = " /WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"

crypto/crypto-lib.com

+18 −3
Original line number Diff line number Diff line
@@ -1132,9 +1132,12 @@ $ CCDEFS = "TCPIP_TYPE_''P4',DSO_VMS" 
$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS

$ CCEXTRAFLAGS = ""

$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS

$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"

$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -

	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS

$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"

$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. ""

$ THEN

$     IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + ","

$     CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS

$ ENDIF

$!

$! Check To See If We Have A ZLIB Option.

$!
@@ -1299,6 +1302,18 @@ $! Finish up the definition of CC. 
$!

$   IF COMPILER .EQS. "DECC"

$   THEN

$!    Not all compiler versions support MAYLOSEDATA3.

$     OPT_TEST = "MAYLOSEDATA3"

$     DEFINE /USER_MODE SYS$ERROR NL:

$     DEFINE /USER_MODE SYS$OUTPUT NL:

$     'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT -

       /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL:

$     IF ($SEVERITY)

$     THEN

$       IF CCDISABLEWARNINGS .NES. "" THEN -

         CCDISABLEWARNINGS = CCDISABLEWARNINGS+ ","

$       CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST

$     ENDIF

$     IF CCDISABLEWARNINGS .EQS. ""

$     THEN

$       CC4DISABLEWARNINGS = "DOLLARID"

engines/makeengines.com

+18 −3
Original line number Diff line number Diff line
@@ -756,9 +756,12 @@ $ CCDEFS = "TCPIP_TYPE_''OPT_TCPIP_LIB',DSO_VMS" 
$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS

$ CCEXTRAFLAGS = ""

$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS

$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX"

$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -

	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS

$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX"

$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. ""

$ THEN

$     IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + ","

$     CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS

$ ENDIF

$!

$! Check To See If We Have A ZLIB Option.

$!
@@ -922,6 +925,18 @@ $! Finish up the definition of CC. 
$!

$   IF COMPILER .EQS. "DECC"

$   THEN

$!    Not all compiler versions support MAYLOSEDATA3.

$     OPT_TEST = "MAYLOSEDATA3"

$     DEFINE /USER_MODE SYS$ERROR NL:

$     DEFINE /USER_MODE SYS$OUTPUT NL:

$     'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT -

       /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL:

$     IF ($SEVERITY)

$     THEN

$       IF CCDISABLEWARNINGS .NES. "" THEN -

         CCDISABLEWARNINGS = CCDISABLEWARNINGS+ ","

$       CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST

$     ENDIF

$     IF CCDISABLEWARNINGS .NES. ""

$     THEN

$       CCDISABLEWARNINGS = " /WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"

ssl/ssl-lib.com

+5 −2
Original line number Diff line number Diff line
@@ -858,8 +858,11 @@ $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS 
$ CCEXTRAFLAGS = ""

$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS

$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"

$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -

	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS

$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. ""

$ THEN

$     IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + ","

$     CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS

$ ENDIF

$!

$! Check To See If We Have A ZLIB Option.

$!