diff options
author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2004-10-09 22:04:13 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2004-10-09 22:04:13 +0000 |
commit | 88908b226ad29d406c49cc43527cf13f02d9d704 (patch) | |
tree | 70405a532f870a9c918ebca97a2ffabe13a8c422 /OpenBSD.cf | |
parent | 20d0a214ba6d0df5259e7332ec9d43dc8642b99e (diff) |
Fix ProPolice support for OpenBSD (merge with the HasGccStackProtector
define that was used on OpenBSD).
remove -ansi from DefaultCCOptions on OpenBSD.
Diffstat (limited to 'OpenBSD.cf')
-rw-r--r-- | OpenBSD.cf | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -1,5 +1,5 @@ XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.100 2004/01/08 22:51:41 herrb Exp $ -XCOMM $XdotOrg: xc/config/cf/OpenBSD.cf,v 1.5 2004/07/24 16:32:39 herrb Exp $ +XCOMM $XdotOrg: xc/config/cf/OpenBSD.cf,v 1.7 2004/09/26 17:06:45 herrb Exp $ XCOMM #ifndef OSName @@ -148,10 +148,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define UseGas YES #define GnuCpp YES -#ifndef HasGccStackProtector -#define HasGccStackProtector NO -#endif - #define UseGnuMalloc NO #define NeedConstPrototypes YES @@ -182,9 +178,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # define DefaultCCOptions $(COPTS) #else # ifdef PpcArchitecture -# define DefaultCCOptions -ansi -fsigned-char GccWarningOptions +# define DefaultCCOptions -fsigned-char GccWarningOptions # else -# define DefaultCCOptions -ansi GccWarningOptions +# define DefaultCCOptions GccWarningOptions # endif #endif #endif @@ -207,7 +203,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe * (This introduces an ABI change) */ #ifndef OverrideShlibRevs -# define OverrideShlibRevs HasGccStackProtector +# define OverrideShlibRevs ProPoliceSupport #endif #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC @@ -651,7 +647,6 @@ install:: fonts.alias @@\ # define ServerOSDefines -DDDXOSINIT # define BootstrapCFlags -Dsun3 # define UnalignedReferencesAllowed YES /* changes _XtCopyArgs() */ -/* Note: -ansi turns off -Dmc68000 */ # define ServerExtraDefines GccGasOption -Dmc68000 -Dmc68020 \ -DXFree86Server -DINCLUDE_CG2_HEADER |