anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of cheaders

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9406 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-12-28 13:48:51 +00:00
parent 99edaf8969
commit b357bc9f19
20 changed files with 15 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-28 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.ac: remove call to LYX_CXX_CHEADERS
2004-12-16 Angus Leeming <leeming@lyx.org>
* configure.ac: remove the HAVE_MKDIR conditional code to

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-28 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxinclude.m4 (LYX_CXX_CHEADERS): remove.
2004-12-15 Angus Leeming <leeming-0hXrFu2P2+c@public.gmane.org>
* lyxinclude.m4: define AC_FUNC_MKDIR.

19
config/lyxinclude.m4
View File

@ -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 <clocale>
#include <cctype>
#include <cerrno>
#include <cmath>
#include <csignal>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <ctime>],[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],[

1
configure.ac
View File

@ -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

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2004-12-28 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* Makefile.am (dist_noinset_DATA): not needed anymore
* cheaders/*: remove.
=======
2004-12-27 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* text3.C: fix LFUN_MATH_MODE.

16
src/Makefile.am
View File

@ -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
@:

8
src/cheaders/ChangeLog
View File

@ -1,8 +0,0 @@
2001-09-02 Angus Leeming <a.leeming@ic.ac.uk>
* cassert: new file. (Required by the boost tuple stuff).
2001-06-01 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* climits: new file

7
src/cheaders/cassert
View File

@ -1,7 +0,0 @@
// -*- C++ -*- forwarding header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CASSERT__
#define __CASSERT__
#include <assert.h>
#endif

7
src/cheaders/cctype
View File

@ -1,7 +0,0 @@
// The -*- C++ -*- character type header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CCTYPE__
#define __CCTYPE__
#include <ctype.h>
#endif

7
src/cheaders/cerrno
View File

@ -1,7 +0,0 @@
// The -*- C++ -*- error number header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CERRNO__
#define __CERRNO__
#include <errno.h>
#endif

7
src/cheaders/climits
View File

@ -1,7 +0,0 @@
// -*- C++ -*- forwarding header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CLIMITS__
#define __CLIMITS__
#include <limits.h>
#endif

7
src/cheaders/clocale
View File

@ -1,7 +0,0 @@
// The -*- C++ -*- locale support header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CLOCALE__
#define __CLOCALE__
#include <locale.h>
#endif

19
src/cheaders/cmath
View File

@ -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 <math.h>
#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

7
src/cheaders/csignal
View File

@ -1,7 +0,0 @@
// The -*- C++ -*- signal handling header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CSIGNAL__
#define __CSIGNAL__
#include <signal.h>
#endif

7
src/cheaders/cstdarg
View File

@ -1,7 +0,0 @@
// -*- C++ -*- forwarding header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CSTDARG__
#define __CSTDARG__
#include <stdarg.h>
#endif

15
src/cheaders/cstddef
View File

@ -1,15 +0,0 @@
// -*- C++ -*- forwarding header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CSTDDEF__
#define __CSTDDEF__
#include <stddef.h>
// 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

7
src/cheaders/cstdio
View File

@ -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 <stdio.h>
#endif

23
src/cheaders/cstdlib
View File

@ -1,23 +0,0 @@
// The -*- C++ -*- standard library header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CSTDLIB__
#define __CSTDLIB__
#include <stdlib.h>
#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

96
src/cheaders/cstring
View File

@ -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 <string.h>
#if 0 // Let's not bother with this just yet.
#include <cstddef>
#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<char *> (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<char *> (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<char *> (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<char *> (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<void *> (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__)

7
src/cheaders/ctime
View File

@ -1,7 +0,0 @@
// The -*- C++ -*- time header.
// This file is part of the GNU ANSI C++ Library.
#ifndef __CTIME__
#define __CTIME__
#include <time.h>
#endif