anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Nuke stl_string_fwd.h

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4392 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-06-13 12:35:36 +00:00
parent ac26e0c1cc
commit 4399c57ed5
6 changed files with 12 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-12 Angus Leeming <leeming@lyx.org>
* configure.in: remove LYX_STL_STRING_FWD.
2002-06-11 John Levon <moz@compsoc.man.ac.uk> 2002-06-11 John Levon <moz@compsoc.man.ac.uk>
* INSTALL: * INSTALL:

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-12 Angus Leeming <leeming@lyx.org>
* lyxinclude.m4 (LYX_STL_STRING_FWD): removed.
2002-06-12 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-06-12 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): fix and simplify the * xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): fix and simplify the

22
config/lyxinclude.m4
View File

@ -705,28 +705,6 @@ rm -f conftest*])
]) ])
### end of LYX_PATH_HEADER ### end of LYX_PATH_HEADER
### Check for stl_string_fwd.h existence and location if it exists
AC_DEFUN(LYX_STL_STRING_FWD,
[ AC_CHECK_HEADER(stl_string_fwd.h,[
AC_CACHE_CHECK([path to stl_string_fwd.h],lyx_cv_path_stl_string_fwd_h,
[ cat > conftest.$ac_ext <<EOF
#line __oline__ "configure"
#include "confdefs.h"
#include <stl_string_fwd.h>
EOF
lyx_cv_path_stl_string_fwd_h=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
grep 'stl_string_fwd.h' 2>/dev/null | \
sed -e 's/.*\(".*stl_string_fwd.h"\).*/\1/' -e "1q"`
rm -f conftest*])
AC_DEFINE_UNQUOTED(STL_STRING_FWD_H_LOCATION,$lyx_cv_path_stl_string_fwd_h,
[define this to the location of stl_string_fwd.h to be used with #include,
NOTE: Do not set it to <stl_string_fwd.h> as that will find the LyX
supplied version of the header.
e.g. <../include/stl_string_fwd.h> or better yet use an absolute path])])
])
dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)] dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)]
dnl if the cache file is inconsistent with the current host, dnl if the cache file is inconsistent with the current host,
dnl target and build system types, execute CMD or print a default dnl target and build system types, execute CMD or print a default

4
configure.in
View File

@ -244,10 +244,6 @@ AC_HEADER_DIRENT
AC_HEADER_MAJOR AC_HEADER_MAJOR
AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h) AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
# some annoying header files
#LYX_PATH_HEADER(stl_string_fwd.h)
LYX_STL_STRING_FWD
# some standard structures # some standard structures
AC_HEADER_STAT AC_HEADER_STAT
AC_HEADER_TIME AC_HEADER_TIME

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-12 Angus Leeming <leeming@lyx.org>
* stl_string_fwd.h: unused and non-compliant anyway. Nuked.
2002-06-13 Angus Leeming <leeming@lyx.org> 2002-06-13 Angus Leeming <leeming@lyx.org>
* LaTeX.C: * LaTeX.C:

35
src/stl_string_fwd.h
View File

@ -1,35 +0,0 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#ifndef LYX_STL_STRING_FWD_H
#define LYX_STL_STRING_FWD_H
/*
* This file exists to appease STLPort when using included lyxstring.
* It won't be around forever ...
*/
#ifndef USE_INCLUDED_STRING
// include the real stl_string_fwd.h
# include STL_STRING_FWD_H_LOCATION
#else
// Hide the forward declaration of string by SGI's STL > 3.13.
// We have to provide the declaration of__get_c_string() ourselves
// since SGI expects it to exist and we're blocking their string declarations
// as best we can.
// Note that a declaration for string is still required so we have to
// provide one via LString.h. ARRae.
# include "LString.h"
# define __SGI_STL_STRING_FWD_H
static char const * __get_c_string(string const &);
#endif // USE_INCLUDED_STRING
#endif // LYX_STL_STRING_FWD_H