From b357bc9f190849c51f11c6e96cb46fd8b8092dfd Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 28 Dec 2004 13:48:51 +0000 Subject: [PATCH] get rid of cheaders git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9406 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++ config/ChangeLog | 4 ++ config/lyxinclude.m4 | 19 --------- configure.ac | 1 - src/ChangeLog | 7 +++ src/Makefile.am | 16 ------- src/cheaders/ChangeLog | 8 ---- src/cheaders/cassert | 7 --- src/cheaders/cctype | 7 --- src/cheaders/cerrno | 7 --- src/cheaders/climits | 7 --- src/cheaders/clocale | 7 --- src/cheaders/cmath | 19 --------- src/cheaders/csignal | 7 --- src/cheaders/cstdarg | 7 --- src/cheaders/cstddef | 15 ------- src/cheaders/cstdio | 7 --- src/cheaders/cstdlib | 23 ---------- src/cheaders/cstring | 96 ------------------------------------------ src/cheaders/ctime | 7 --- 20 files changed, 15 insertions(+), 260 deletions(-) delete mode 100644 src/cheaders/ChangeLog delete mode 100644 src/cheaders/cassert delete mode 100644 src/cheaders/cctype delete mode 100644 src/cheaders/cerrno delete mode 100644 src/cheaders/climits delete mode 100644 src/cheaders/clocale delete mode 100644 src/cheaders/cmath delete mode 100644 src/cheaders/csignal delete mode 100644 src/cheaders/cstdarg delete mode 100644 src/cheaders/cstddef delete mode 100644 src/cheaders/cstdio delete mode 100644 src/cheaders/cstdlib delete mode 100644 src/cheaders/cstring delete mode 100644 src/cheaders/ctime diff --git a/ChangeLog b/ChangeLog index 8b6e4fbb30..0062760552 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-28 Jean-Marc Lasgouttes + + * configure.ac: remove call to LYX_CXX_CHEADERS + 2004-12-16 Angus Leeming * configure.ac: remove the HAVE_MKDIR conditional code to diff --git a/config/ChangeLog b/config/ChangeLog index a9153969e7..e57a66844e 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2004-12-28 Jean-Marc Lasgouttes + + * lyxinclude.m4 (LYX_CXX_CHEADERS): remove. + 2004-12-15 Angus Leeming * lyxinclude.m4: define AC_FUNC_MKDIR. diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 8ea6b2355a..ce03af6cf7 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -405,25 +405,6 @@ AC_DEFUN([LYX_CXX_PARTIAL], [ ]) -dnl Usage: LYX_CXX_CHEADERS : checks whether the C++ compiler -dnl provides wrappers for C headers and use our alternate version otherwise. -AC_DEFUN([LYX_CXX_CHEADERS],[ -AC_CACHE_CHECK(for C headers wrappers,lyx_cv_cxx_cheaders, - [AC_TRY_CPP([ -#include -#include -#include -#include -#include -#include -#include -#include -#include ],[lyx_cv_cxx_cheaders=yes],[lyx_cv_cxx_cheaders=no])]) -if test $lyx_cv_cxx_cheaders = no ; then - LYX_ADD_INC_DIR(lyx_cppflags,\$(top_srcdir)/src/cheaders) -fi]) - - dnl Usage: LYX_CXX_GLOBAL_CSTD: checks whether C library functions dnl are already in the global namespace AC_DEFUN([LYX_CXX_GLOBAL_CSTD],[ diff --git a/configure.ac b/configure.ac index cdb0941a9e..1b5e92e382 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,6 @@ dnl we do not need that currently (and probably all our supported dnl compiler allow that) dnl LYX_CXX_PARTIAL LYX_CXX_EXPLICIT -LYX_CXX_CHEADERS LYX_CXX_GLOBAL_CSTD LYX_STD_COUNT dnl we disable rtti for now diff --git a/src/ChangeLog b/src/ChangeLog index 05f6715f48..0f36c74b23 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2004-12-28 Jean-Marc Lasgouttes + + * Makefile.am (dist_noinset_DATA): not needed anymore + + * cheaders/*: remove. + +======= 2004-12-27 Jürgen Spitzmüller * text3.C: fix LFUN_MATH_MODE. diff --git a/src/Makefile.am b/src/Makefile.am index bac6639a51..74b22d8519 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -277,22 +277,6 @@ lyx_SOURCES = \ vspace.C \ vspace.h -dist_noinst_DATA = \ - cheaders/ChangeLog \ - cheaders/cassert \ - cheaders/cctype \ - cheaders/cerrno \ - cheaders/climits \ - cheaders/clocale \ - cheaders/cmath \ - cheaders/csignal \ - cheaders/cstdarg \ - cheaders/cstddef \ - cheaders/cstdio \ - cheaders/cstdlib \ - cheaders/cstring \ - cheaders/ctime - version.C: stamp-version @: diff --git a/src/cheaders/ChangeLog b/src/cheaders/ChangeLog deleted file mode 100644 index e882fc0ce8..0000000000 --- a/src/cheaders/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -2001-09-02 Angus Leeming - - * cassert: new file. (Required by the boost tuple stuff). - -2001-06-01 Jean-Marc Lasgouttes - - * climits: new file - diff --git a/src/cheaders/cassert b/src/cheaders/cassert deleted file mode 100644 index b4165bfae7..0000000000 --- a/src/cheaders/cassert +++ /dev/null @@ -1,7 +0,0 @@ -// -*- C++ -*- forwarding header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CASSERT__ -#define __CASSERT__ -#include -#endif diff --git a/src/cheaders/cctype b/src/cheaders/cctype deleted file mode 100644 index e2765aed50..0000000000 --- a/src/cheaders/cctype +++ /dev/null @@ -1,7 +0,0 @@ -// The -*- C++ -*- character type header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CCTYPE__ -#define __CCTYPE__ -#include -#endif diff --git a/src/cheaders/cerrno b/src/cheaders/cerrno deleted file mode 100644 index ce49346959..0000000000 --- a/src/cheaders/cerrno +++ /dev/null @@ -1,7 +0,0 @@ -// The -*- C++ -*- error number header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CERRNO__ -#define __CERRNO__ -#include -#endif diff --git a/src/cheaders/climits b/src/cheaders/climits deleted file mode 100644 index 1b29b3af01..0000000000 --- a/src/cheaders/climits +++ /dev/null @@ -1,7 +0,0 @@ -// -*- C++ -*- forwarding header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CLIMITS__ -#define __CLIMITS__ -#include -#endif diff --git a/src/cheaders/clocale b/src/cheaders/clocale deleted file mode 100644 index b67cf31c9d..0000000000 --- a/src/cheaders/clocale +++ /dev/null @@ -1,7 +0,0 @@ -// The -*- C++ -*- locale support header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CLOCALE__ -#define __CLOCALE__ -#include -#endif diff --git a/src/cheaders/cmath b/src/cheaders/cmath deleted file mode 100644 index 465bbe3fab..0000000000 --- a/src/cheaders/cmath +++ /dev/null @@ -1,19 +0,0 @@ -// The -*- C++ -*- math functions header. -// This file is part of the GNU ANSI C++ Library. -// Modified for use with LyX. - -#ifndef __CMATH__ -#define __CMATH__ - -#include - -#ifdef __GNUG__ -#pragma interface "cmath" -#endif - -namespace std { - inline float abs (float x) { return fabs (x); } - inline double abs (double x) { return fabs (x); } -} - -#endif diff --git a/src/cheaders/csignal b/src/cheaders/csignal deleted file mode 100644 index 6febfb7b2e..0000000000 --- a/src/cheaders/csignal +++ /dev/null @@ -1,7 +0,0 @@ -// The -*- C++ -*- signal handling header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CSIGNAL__ -#define __CSIGNAL__ -#include -#endif diff --git a/src/cheaders/cstdarg b/src/cheaders/cstdarg deleted file mode 100644 index 324f5a1c19..0000000000 --- a/src/cheaders/cstdarg +++ /dev/null @@ -1,7 +0,0 @@ -// -*- C++ -*- forwarding header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CSTDARG__ -#define __CSTDARG__ -#include -#endif diff --git a/src/cheaders/cstddef b/src/cheaders/cstddef deleted file mode 100644 index 0607a1ba8c..0000000000 --- a/src/cheaders/cstddef +++ /dev/null @@ -1,15 +0,0 @@ -// -*- C++ -*- forwarding header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CSTDDEF__ -#define __CSTDDEF__ -#include - -// Add some types in the std namespace, since the boost library seems -// to look for them (JMarc) -namespace std { - typedef ::size_t size_t; - typedef ::ptrdiff_t ptrdiff_t; -} - -#endif diff --git a/src/cheaders/cstdio b/src/cheaders/cstdio deleted file mode 100644 index 1fe1456b5b..0000000000 --- a/src/cheaders/cstdio +++ /dev/null @@ -1,7 +0,0 @@ -// The -*- C++ -*- standard I/O header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CSTDIO__ -#define __CSTDIO__ -#include -#endif diff --git a/src/cheaders/cstdlib b/src/cheaders/cstdlib deleted file mode 100644 index e7c1a5160a..0000000000 --- a/src/cheaders/cstdlib +++ /dev/null @@ -1,23 +0,0 @@ -// The -*- C++ -*- standard library header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CSTDLIB__ -#define __CSTDLIB__ -#include - -#ifdef __GNUG__ -#pragma interface "cstdlib" -#endif - -extern "C++" { - -#if _G_HAS_LABS -inline long abs(long x) { return labs (x); } -#else -inline long abs(long x) { return x >= 0 ? x : -x; } -#endif -//inline ldiv_t div(long x, long y) { return ldiv (x, y); } - -} // extern "C++" - -#endif diff --git a/src/cheaders/cstring b/src/cheaders/cstring deleted file mode 100644 index d8d03a765b..0000000000 --- a/src/cheaders/cstring +++ /dev/null @@ -1,96 +0,0 @@ -// The -*- C++ -*- null-terminated string header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CSTRING__ -#define __CSTRING__ - -#include - -#if 0 // Let's not bother with this just yet. -#include - -#ifdef __GNUG__ -#pragma interface "cstring" -#endif - -// The ANSI C prototypes for these functions have a const argument type and -// non-const return type, so we can't use them. - -extern "C++" { -extern inline const char * -_G_strchr (const char *s, int c) -{ - return strchr (s, c); -} - -extern inline char * -_G_strchr (char *s, int c) -{ - return const_cast (strchr (s, c)); -} - -extern inline const char * -_G_strpbrk (const char *s1, const char *s2) -{ - return strpbrk (s1, s2); -} - -extern inline char * -_G_strpbrk (char *s1, const char *s2) -{ - return const_cast (strpbrk (s1, s2)); -} - -extern inline const char * -_G_strrchr (const char *s, int c) -{ - return strrchr (s, c); -} - -extern inline char * -_G_strrchr (char *s, int c) -{ - return const_cast (strrchr (s, c)); -} - -extern inline const char * -_G_strstr (const char *s1, const char *s2) -{ - return strstr (s1, s2); -} - -extern inline char * -_G_strstr (char *s1, const char *s2) -{ - return const_cast (strstr (s1, s2)); -} - -extern inline const void * -_G_memchr (const void *s, int c, size_t n) -{ - return memchr (s, c, n); -} - -extern inline void * -_G_memchr (void *s, int c, size_t n) -{ - return const_cast (memchr (s, c, n)); -} -} // extern "C++" - -// Lose any vendor macros for these functions. -#undef strchr -#undef strpbrk -#undef strrchr -#undef strstr -#undef memchr - -// Ewww, namespace pollution. Anyone have a better idea? -#define strchr _G_strchr -#define strpbrk _G_strpbrk -#define strrchr _G_strrchr -#define strstr _G_strstr -#define memchr _G_memchr -#endif // 0 - -#endif // !defined (__CSTRING__) diff --git a/src/cheaders/ctime b/src/cheaders/ctime deleted file mode 100644 index 0184da5929..0000000000 --- a/src/cheaders/ctime +++ /dev/null @@ -1,7 +0,0 @@ -// The -*- C++ -*- time header. -// This file is part of the GNU ANSI C++ Library. - -#ifndef __CTIME__ -#define __CTIME__ -#include -#endif