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

Fix FreeBSD 10.2 build

Browse Source
This commit is contained in:
Ulrich Wilkens
2015-10-21 18:49:07 +02:00
committed by Jon Trulson
parent ae16363537
commit f8fdf4920f
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/config/cf/FreeBSD.cf
View File

@@ -45,6 +45,9 @@ USE_GCC = UseGcc
#define StandardCppDefines -traditional CppArgs #define StandardCppDefines -traditional CppArgs
#endif #endif
#ifndef PerlCmd
#define PerlCmd /usr/local/bin/perl
#endif
#undef InstallCmd #undef InstallCmd
#define InstallCmd /usr/bin/install #define InstallCmd /usr/bin/install
#undef KornShell #undef KornShell

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

@@ -5,8 +5,8 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
INCLUDES = -I. -I../include -I../include/MotifApp \ INCLUDES = -I. -I../include -I../include/MotifApp \
-I../include/utils -I../include/DtMail \ -I../include/utils -I../include/DtMail \
-I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC) -I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC) $(STD_INCLUDES)
#ifndef DtMailDefines #ifndef DtMailDefines
# define DtMailDefines # define DtMailDefines

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

@@ -4,7 +4,8 @@ XCOMM $TOG: Imakefile /main/15 1998/08/05 13:24:40 mgreess $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB) EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
INCLUDES = -I. -I../include -I../../dtcompat -I../../../. -I$(CDELIBSRC) INCLUDES = -I. -I../include -I../../dtcompat -I../../../. \
-I$(CDELIBSRC) $(STD_INCLUDES)
#ifndef DtMailDefines #ifndef DtMailDefines
# define DtMailDefines # define DtMailDefines

4
cde/programs/dtmail/include/DtMail/DtMail.hh
View File

@@ -26,7 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#if defined(sun) #if defined(sun) || defined(__FreeBSD__)
#include <iconv.h> #include <iconv.h>
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
@@ -914,7 +914,7 @@ friend class Session;
DTMailError_t minor_code); DTMailError_t minor_code);
}; };
#if defined(sun) #if defined(sun) || defined(__FreeBSD__)
template <typename T> template <typename T>
size_t iconv (iconv_t i, const T inbuf, size_t* inleft, size_t iconv (iconv_t i, const T inbuf, size_t* inleft,
char** outbuf, size_t* outleft) char** outbuf, size_t* outleft)