debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add -fpermissive to linux standard c++ option define in linux.cf

Browse Source 
Remove from individual Imakefiles.

Also, remove '#if 0' block in linux.cf, and remove empty
LinuxMachineDefines. This should be working correctly.  If not, let me
know.
This commit is contained in:
Jon Trulson
2012-06-18 16:27:25 -06:00
parent 91f7988cf3
commit 784c7dff56
21 changed files with 4 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cde/programs/dtmail/MotifApp/Imakefile
View File

@@ -34,11 +34,6 @@ EXTRA_C++OPTIONS = -xF +p +w $(SPRO_V3_OPTIONS)
#endif /* SunArchitecture */
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
HEADERS =
SRCS = \

4
cde/programs/dtmail/dtmail/Imakefile
View File

@@ -16,10 +16,6 @@ DEFINES = -DRELEASE_NOTES -DDTMAIL_TOOLTALK -DDTEDITOR DtMailDefines
DEPLIBS = ../MotifApp/libMotifApp.a ../libDtMail/libDtMail.a DepDtClientLibs
LOCAL_LIBRARIES = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a DtClientLibs
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
/* Sun needs the widechar library */
#ifdef SunArchitecture
SYS_LIBRARIES = $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lw -lm

4
cde/programs/dtmail/dtmailpr/Imakefile
View File

@@ -40,10 +40,6 @@ MT_LIBS = -i $(C++_LIB) -lm -lw -lc
SYS_LIBRARIES = -lintl -lnsl $(MT_LIBS) -lC
#endif /* SunArchitecture */
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = main.C message.C mailbox.C utils.C
OBJS = main.o message.o mailbox.o utils.o

4
cde/programs/dtmail/libDtMail/Common/Imakefile
View File

@@ -14,10 +14,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC)
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
#if HasVFork
VFORK_DEFINES = -DHAS_VFORK
#else

4
cde/programs/dtmail/libDtMail/RFC/Imakefile
View File

@@ -14,10 +14,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC)
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
#if HasVFork
VFORK_DEFINES = -DHAS_VFORK
#else

4
cde/programs/dtprintinfo/Imakefile
View File

@@ -23,10 +23,6 @@ all:: $(DTPRINTINFO_GEN)
.NO_PARALLEL:
#endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
INCLUDES = -I. -I./UI -I./libUI -I./util -I./libUI/MotifUI \
-I./objects -I./objects/PrintObj

5
cde/programs/dtprintinfo/UI/Imakefile
View File

@@ -16,11 +16,6 @@ INCLUDES = -I. -I.. -I../libUI -I../libUI/MotifUI -I../objects -I../util -I../ob
DEFINES = -DHAS_EXCEPTIONS
#endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = DtActions.C DtApp.C DtDetailsLabel.C \
DtFindD.C DtFindSet.C DtMainW.C \
DtPrinterIcon.C DtProps.C DtPrtJobIcon.C \

4
cde/programs/dtsearchpath/libCliSrv/Imakefile
View File

@@ -22,10 +22,6 @@ EXTRA_DEFINES = -DIOSTREAMSWORKS
EXTRA_DEFINES = -DIOSTREAMSWORKS
#endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = DirIterator.C Environ.C TTFile.C \
UnixEnv.C cstring.C

4
cde/programs/nsgmls/Imakefile
View File

@@ -77,7 +77,7 @@ STLIBCENV =
M4 = /bin/m4
#endif
#ifdef LinuxArchitecture
#if defined(LinuxArchitecture(
/*
* put cpp directives here rather than in CXXDEFINES because
@@ -95,8 +95,6 @@ CXXTEMPLATEFLAGS =
M4 = /usr/bin/m4
CXXEXTRA_DEFINES = -fpermissive
#endif
#if defined(RsArchitecture)