[Libreoffice-commits] .: dmake/unix scp2/source soltools/mkdepend
François Tigeot
ftigeot at kemper.freedesktop.org
Mon Feb 21 06:54:56 PST 2011
dmake/unix/runargv.c | 3 ++-
scp2/source/ooo/ure.scp | 4 ++--
soltools/mkdepend/imakemdep.h | 9 ++++++++-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit bd6e24148e396eb821c5c904a324a992bde7bb03
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Sun Feb 20 20:08:46 2011 +0100
Add DragonFly defines.
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 03d9a45..121501d 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -438,7 +438,8 @@ private_strerror (errnum)
int errnum;
{
#ifndef __APPLE__
-# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || \
+ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
extern const char * const sys_errlist[];
# else
extern char *sys_errlist[];
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index cda47b4..0053aba 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1000,7 +1000,7 @@ End
#endif
#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
File gid_File_Dl_GccS
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -1015,7 +1015,7 @@ End
#endif
#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
- || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
File gid_File_Dl_Stdcpp
Dir = SCP2_URE_DL_DIR;
TXT_FILE_BODY;
diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h
index 18f2d4b..18ab7a7 100644
--- a/soltools/mkdepend/imakemdep.h
+++ b/soltools/mkdepend/imakemdep.h
@@ -274,7 +274,9 @@ char *cpp_argv[ARGUMENTS] = {
#ifdef unix
"-Uunix", /* remove unix symbol so that filename unix.c okay */
#endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
+ defined(MACH) || defined(DRAGONFLY)
+/* FIXME: strange list of obsolete systems */
# ifdef __i386__
"-D__i386__",
# endif
@@ -514,6 +516,8 @@ char *cpp_argv[ARGUMENTS] = {
* them to the the following table. The definition of struct symtab is
* in util/makedepend/def.h.
*/
+
+/* FIXME: strange list of obsolete systems */
struct pair predefs[] = {
#ifdef apollo
{"apollo", "1", NULL},
@@ -720,6 +724,9 @@ struct pair predefs[] = {
#ifdef __OpenBSD__
{"__OpenBSD__", "1", NULL},
#endif
+#ifdef __DragonFly__
+ {"__DragonFly__", "1", NULL},
+#endif
#ifdef __EMX__
{"__EMX__", "1", NULL},
#endif
More information about the Libreoffice-commits
mailing list