Fix compile bug for systems that have nl_langinfo but CODESET undefined

diff --git a/CHANGELOG b/CHANGELOG
index d8786b1..eb3f90c 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
 Possible compatibility problems with earlier versions marked with '*'.
 

+Fix compile bug for systems that have nl_langinfo but CODESET undefined.
+

 Added missing PQF transform rules for <= and >= . Thanks to Peter Popovics.
 
 Added scan for the ZOOM shell (zoomsh).
 Added missing PQF transform rules for <= and >= . Thanks to Peter Popovics.
 
 Added scan for the ZOOM shell (zoomsh).

diff --git a/client/client.c b/client/client.c
index 0327810..8afcd37 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *

- * $Id: client.c,v 1.183 2003-02-23 20:40:17 adam Exp $
+ * $Id: client.c,v 1.184 2003-02-25 18:35:48 adam Exp $

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

@@ -3321,8 +3321,10 @@ int main(int argc, char **argv)
         fprintf (stderr, "setlocale failed\n");
 #endif
 #if HAVE_LANGINFO_H
         fprintf (stderr, "setlocale failed\n");
 #endif
 #if HAVE_LANGINFO_H

+#ifdef CODESET

     codeset = nl_langinfo(CODESET);
 #endif
     codeset = nl_langinfo(CODESET);
 #endif

+#endif

 
     while ((ret = options("k:c:a:m:v:p:u:t:", argv, argc, &arg)) != -2)
     {
 
     while ((ret = options("k:c:a:m:v:p:u:t:", argv, argc, &arg)) != -2)
     {

diff --git a/util/marcdump.c b/util/marcdump.c
index e46beab..bd71b7d 100644 (file)
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -3,7 +3,7 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *

- * $Id: marcdump.c,v 1.21 2003-02-12 22:02:33 adam Exp $
+ * $Id: marcdump.c,v 1.22 2003-02-25 18:35:49 adam Exp $

  */
 
 #if HAVE_CONFIG_H
  */
 
 #if HAVE_CONFIG_H

@@ -58,8 +58,10 @@ int main (int argc, char **argv)
     setlocale(LC_CTYPE, "");
 #endif
 #if HAVE_LANGINFO_H
     setlocale(LC_CTYPE, "");
 #endif
 #if HAVE_LANGINFO_H

+#ifdef CODESET

     to = nl_langinfo(CODESET);
 #endif
     to = nl_langinfo(CODESET);
 #endif

+#endif

 
     while ((r = options("vc:xOXf:t:", argv, argc, &arg)) != -2)
     {
 
     while ((r = options("vc:xOXf:t:", argv, argc, &arg)) != -2)
     {