* flower/include/libc-extension.hh (memrev): Rename from strrev.
* configure.in: Search for mingw wcrtomb library.
+2005-05-02 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * flower/include/international.hh: Bugfix: include "string.hh".
+
+ * lily/include/mingw-compatibility.hh: New file.
+
+ * flower/include/libc-extension.hh (memrev): Rename from strrev.
+
+ * configure.in: Search for mingw wcrtomb library.
+
2005-05-02 Mats Bengtsson <mabe@drongo.s3.kth.se>
* scripts/convert-ly.py: Bug fix
/* default lilypond locale dir */
#define LOCALEDIR "@LOCALEDIR@"
+/* define if you have chroot */
+#define HAVE_CHROOT 0
+
/* define if you have fopencookie */
#define HAVE_FOPENCOOKIE 0
/* define if you have gettext */
#define HAVE_GETTEXT 0
+/* define if you have isinf */
+#define HAVE_ISINF 0
+
+/* define if you have lrint */
+#define HAVE_LRINT 0
+
/* define if you have memmem */
#define HAVE_MEMMEM 0
+/* define if you have mbrtowc */
+#define HAVE_MBRTOWC 0
+
/* define if you have snprintf */
#define HAVE_SNPRINTF 0
/* define if you have vsnprintf */
#define HAVE_VSNPRINTF 0
+/* define if you have wcrtomb */
+#define HAVE_WCRTOMB 0
+
/* define if you have yyFlexLexer.yy_current_buffer */
#undef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
-/* define if you have isinf */
-#define HAVE_ISINF 0
-
-/* define if you have lrint */
-#define HAVE_LRINT 0
-
/* define if you want KPATHSEA */
#define KPATHSEA @KPATHSEA@
+/* define if you have grp header */
+#define HAVE_GRP_H 0
+
/* define if you have kpatsea header */
#define HAVE_KPATHSEA_KPATHSEA_H 0
/* define if you have kpse_find_tfm */
#define HAVE_KPSE_FIND_TFM 0
+/* define if you have pwd header */
+#define HAVE_PWD_H 0
+
/* define if you have Python.h header */
#define HAVE_PYTHON_H 0
STEPMAKE_KPATHSEA
-STEPMAKE_PYTHON(REQUIRED,2.1)
+STEPMAKE_PYTHON(REQUIRED, 2.1)
STEPMAKE_GCC(REQUIRED, 2.8)
STEPMAKE_CXX(REQUIRED)
STEPMAKE_GXX(REQUIRED, 3.0.5)
STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1)
STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
-AC_CHECK_HEADERS([assert.h libio.h sys/stat.h])
+AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS([sstream])
AC_LANG_POP(C++)
AC_HEADER_STAT
AC_FUNC_MEMCMP
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([fopencookie funopen gettext isinf memmem snprintf vsnprintf])
+AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf mbrtowc memmem snprintf vsnprintf wcrtomb])
AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
+AC_SEARCH_LIBS(wcrtomb, [mingwex msvcp60])
STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
if test "$gui_b" = "yes"; then
EOF
chmod 755 i686-cygwin-guile-config
PATH=$(pwd):$PATH
- export PKG_CONFIG_PATH=$cygwin_root/usr/lib/pkgconfig
+ export PKG_CONFIG_PATH=$cygwin_prefix/lib/pkgconfig
export PKG_CONFIG="pkg-config \
---define-variable prefix=$cygwin_root \
---define-variable includedir=$cygwin_root/usr/include"
+--define-variable prefix=$cygwin_prefix \
+--define-variable includedir=$cygwin_prefix/include \
+--define-variable libdir=$cygwin_prefix/lib"
fi
export CFLAGS="-DKPSE_DLL"
}
#ifndef INTERNATIONAL_HH
#define INTERNATIONAL_HH
+#include "string.hh"
+
/**
Internationalisation: _i ("to be translated") gets an entry in the POT file
gettext () must be invoked explicitely to do the actual "translation".
} /* extern "C" */
#endif
+#if ! HAVE_MEMRCHR
unsigned char *memrchr (unsigned char const *p, int n, char c);
-unsigned char *strrev (unsigned char *byte, int length_i);
+#endif
+
+#if ! HAVE_MEMREV
+unsigned char *memrev (unsigned char *byte, int length_i);
+#endif
double my_round (double);
}
unsigned char *
-strrev (unsigned char *byte, int length)
+memrev (unsigned char *byte, int length)
{
unsigned char tmp_byte;
unsigned char *left = byte;
void
String::reverse ()
{
- strrev (get_bytes (), length ());
+ memrev (get_bytes (), length ());
}
int
#include "config.hh"
-#include <libintl.h> /* gettext on MacOS X */
#include <math.h> /* isinf */
#include <stdio.h>
#include <string.h> /* memset */
#include <wchar.h> /* wcrtomb */
#endif
+#include "international.hh"
#include "libc-extension.hh"
#include "lily-guile.hh"
#include "string.hh"
#define FONT_METRIC_HH
#include "box.hh"
-#include "smobs.hh"
#include "lily-proto.hh"
+#include "smobs.hh"
class Font_metric
{
#ifndef LILY_GUILE_HH
#define LILY_GUILE_HH
+#if __MINGW32__
+#include "mingw-compatibility.hh"
+#endif
+
#include <libguile.h>
-#include "interval.hh"
#include "guile-compatibility.hh"
+#include "interval.hh"
#include "lily-guile-macros.hh"
#include "ly-module.hh"
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "lily-guile.hh"
+
#include <cstdio>
#include <cstdlib>
#include <cstring> /* strdup, strchr */
#include <cctype>
-#include <libintl.h> // gettext on macos x
#include "config.hh"
-#include "version.hh"
-#include "lily-guile.hh"
+
+#include "dimensions.hh"
+#include "direction.hh"
+#include "file-path.hh"
+#include "international.hh"
#include "libc-extension.hh"
#include "main.hh"
-#include "file-path.hh"
-#include "warn.hh"
-#include "direction.hh"
+#include "misc.hh"
#include "offset.hh"
#include "pitch.hh"
-#include "dimensions.hh"
#include "source-file.hh"
-#include "misc.hh"
+#include "version.hh"
+#include "warn.hh"
// #define TEST_GC
#include <cstring>
#include <unistd.h>
#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "config.hh"
+#if HAVE_GRP_H
+#include <grp.h>
+#endif
+#if HAVE_PWD_H
+#include <pwd.h>
+#endif
#if HAVE_GETTEXT
#include <libintl.h>
#endif
{_i ("DIR"), "include", 'I', _i ("add DIR to search path")},
{_i ("FILE"), "init", 'i', _i ("use FILE as init file")},
{_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")},
+#if HAVE_CHROOT
{_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n and cd into DIR")},
+#endif
{0, "no-print", 0, _i ("do not generate printed output")},
{0, "preview", 'p', _i ("generate a preview of the first system")},
{0, "safe-mode", 's', _i ("run in safe mode")},
void init_global_tweak_registry ();
void init_fontconfig ();
+#if HAVE_CHROOT
static void
do_chroot_jail ()
{
exit (3);
}
}
+#endif
void test_pango ();
exit (2);
}
+#if HAVE_CHROOT
if (! jail_spec.is_empty ())
do_chroot_jail ();
+#endif
SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files);
(void) result;
(c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include <map>
-#include <stdio.h>
+#include "open-type-font.hh"
#include <freetype/tttables.h>
+#include <stdio.h>
-#include "warn.hh"
-#include "open-type-font.hh"
#include "dimensions.hh"
#include "modified-font-metric.hh"
+#include "warn.hh"
FT_Byte *
load_table (char const *tag_str, FT_Face face, FT_ULong *length)
#include "config.hh"
#if HAVE_UTF8_WCHAR_H
-#include <utf8/wchar.h> /* wcrtomb */
+#include <utf8/wchar.h> /* mbrtowc */
#else
-#include <wchar.h> /* wcrtomb */
+#include <wchar.h> /* mbrtowc */
#endif
#include <cstdio>
"Project-Id-Version: lilypond 2.2.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-04-19 22:41+0200\n"
-"PO-Revision-Date: 2005-04-19 23:28+0200\n"
+"PO-Revision-Date: 2005-04-25 21:59+0200\n"
"Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
"MIME-Version: 1.0\n"
#: main.cc:150
msgid "USER,GROUP,JAIL,DIR"
-msgstr "GEBRU,GROUP,GEVANG,DIR"
+msgstr "GEBR,GROEP,GEVANG,DIR"
#: main.cc:150
msgid ""