* flower/include/international.hh: Bugfix: include "string.hh".

* flower/include/libc-extension.hh (memrev): Rename from strrev.

* configure.in: Search for mingw wcrtomb library.

diff --git a/ChangeLog b/ChangeLog
index 3ab9f1e58106cc7c7e1fbe9d799ff9b25c69541a..fc6a9bc049e770701f2ede73c04446407a4ba7d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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

diff --git a/config.hh.in b/config.hh.in
index bd0e19a25264afb537b8d8bf34dcca5d0f4c0227..a0c9473de6cefe3ff12708ca34278033384a8fcb 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -10,6 +10,9 @@
 /* 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
 
@@ -19,27 +22,36 @@
 /* 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
 
@@ -49,6 +61,9 @@
 /* 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
 

diff --git a/configure.in b/configure.in
index 8de34b0d97a89de578f212b2c534af0d23ffce84..bfa2d26df39e96f226d436fd55a261451853dc99 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,7 @@ STEPMAKE_COMPILE
 
 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)
@@ -59,15 +59,16 @@ STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.14)
 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

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 5de8c1344337fabe45ebc3268b7f1c8c044eb6b2..47c3a5733e69f85cefd05d8da80418831961564b 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -104,10 +104,11 @@ exit 0
 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"
 }

diff --git a/flower/include/international.hh b/flower/include/international.hh
index 5d1d27f40e00a17751ec5dd338d308384828a691..095e47b43e1ac030df0e44cae0e86d90a19a72af 100644 (file)
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -9,6 +9,8 @@
 #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".

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 62e5a5a2b8407ac462dd3cfe5c94c16536de9ad4..3ee0fe426c09e6532dc27aced27900b02399fde9 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -107,8 +107,13 @@ extern "C" {
 } /* 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);
 

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 3fa6e9b2d8e29f01dd3868d8f3c1dbcdce3d1cc4..51aabebe054648c750e17322f9f42689ea3a5afa 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -121,7 +121,7 @@ my_swap (T &t1, T &t2, T &tmp)
 }
 
 unsigned char *
-strrev (unsigned char *byte, int length)
+memrev (unsigned char *byte, int length)
 {
   unsigned char tmp_byte;
   unsigned char *left = byte;

diff --git a/flower/string.cc b/flower/string.cc
index b19180401384fc433d78af1c4d101c0a31eafe07..fb270dd30db82ae5c909e40f17b895e8e0412327 100644 (file)
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -348,7 +348,7 @@ String::to_lower ()
 void
 String::reverse ()
 {
-  strrev (get_bytes (), length ());
+  memrev (get_bytes (), length ());
 }
 
 int

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 830cd6eaca4f45f056e6667810f0ff8238c231d1..7b9233fd10ced1ee941700536885b9b689838e1d 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -9,7 +9,6 @@
 
 #include "config.hh"
 
-#include <libintl.h>  /* gettext on MacOS X */
 #include <math.h>  /* isinf */
 #include <stdio.h>
 #include <string.h>  /* memset */
@@ -19,6 +18,7 @@
 #include <wchar.h> /* wcrtomb */
 #endif
 
+#include "international.hh"
 #include "libc-extension.hh"
 #include "lily-guile.hh"
 #include "string.hh"

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 48d16b83168c8f20e3138b8438830863fe13851b..a8846aa5689f6225e892eecec8d52278fc01fa3f 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -10,8 +10,8 @@
 #define FONT_METRIC_HH
 
 #include "box.hh"
-#include "smobs.hh"
 #include "lily-proto.hh"
+#include "smobs.hh"
 
 class Font_metric
 {

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index ec63fdcce864c5ecd3b420b49277839343ba56f5..dd28743ccfcc5bdad32ba9e90f1452a555dedcbd 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -9,10 +9,14 @@
 #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"
 

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index e485c86fecf2dedbf73e3b218ea47aa553884c81..a7b3511a63ad929afed7ed18ac452a3fa04c7681 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -7,25 +7,27 @@
   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
 

diff --git a/lily/main.cc b/lily/main.cc
index 690f1d70f2562e70d61a7e8676542b9d6744c10c..cf6f9fd2c062fa0ca22ab070416a861786515745 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -13,13 +13,17 @@
 #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
@@ -152,7 +156,9 @@ static Long_option_init options_static[]
   {_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")},
@@ -284,6 +290,7 @@ prepend_load_path (String dir)
 void init_global_tweak_registry ();
 void init_fontconfig ();
 
+#if HAVE_CHROOT
 static void
 do_chroot_jail ()
 {
@@ -366,6 +373,7 @@ do_chroot_jail ()
       exit (3);
     }
 }
+#endif
 
 void test_pango ();
 
@@ -440,8 +448,10 @@ main_with_guile (void *, int, char **)
       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;

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index f978dd20bc7f14ab8076ff6d6bf816ee5b074441..ddde7dcfab44001951a356fcbc1381277501cc54 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -6,15 +6,14 @@
   (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)

diff --git a/lily/source-file.cc b/lily/source-file.cc
index c90483812486203b91bc1d1a1c6f6857ab3b7b47..2d3e70a3175c481f78272d3f0077b8387f9a50e3 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -12,9 +12,9 @@
 #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>

diff --git a/po/nl.po b/po/nl.po
index c0321eccb8401776a748286e7fa4f8e432c0e99e..2f2eeb0d301cc5576c802c1aa34993aac4802355 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgstr ""
 "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"
@@ -1242,7 +1242,7 @@ msgstr "schrijf uitvoer naar BESTAND (extensie wordt toegevoegd)"
 
 #: main.cc:150
 msgid "USER,GROUP,JAIL,DIR"
-msgstr "GEBRU,GROUP,GEVANG,DIR"
+msgstr "GEBR,GROEP,GEVANG,DIR"
 
 #: main.cc:150
 msgid ""