# HG changeset patch
# User masneyb
# Date 1100216885 0
# Node ID 43a0556c994f5c322d0523497837f3028ca0e13f
# Parent  d2bf2d3b0173369a67901a5b8948a7e65a8deae4
2004-11-11 Brian Masney <masneyb@gftp.org>

        * configure.in - fixes for HP/UX
        (from "H.Merijn Brand" <h.m.brand@hccnet.nl>)

        * lib/gftp.h - fixes for large files under HP/UX
        (from "H.Merijn Brand" <h.m.brand@hccnet.nl>)

        * lib/protocols.c (gftp_list_files) - if ENABLE_NLS is disabled, then
        do not use setlocale()

diff -r d2bf2d3b0173 -r 43a0556c994f ChangeLog
--- a/ChangeLog	Thu Nov 11 23:33:41 2004 +0000
+++ b/ChangeLog	Thu Nov 11 23:48:05 2004 +0000
@@ -1,4 +1,13 @@
 2004-11-11 Brian Masney <masneyb@gftp.org>
+	* configure.in - fixes for HP/UX
+	(from "H.Merijn Brand" <h.m.brand@hccnet.nl>)
+
+	* lib/gftp.h - fixes for large files under HP/UX
+	(from "H.Merijn Brand" <h.m.brand@hccnet.nl>)
+
+	* lib/protocols.c (gftp_list_files) - if ENABLE_NLS is disabled, then
+	do not use setlocale()
+
 	* docs/website/index.html.in - fixed several typos on the website.
 	Updated introduction paragraph
 
@@ -3059,7 +3068,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.368 2004/11/11 23:33:41 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.369 2004/11/11 23:48:05 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r d2bf2d3b0173 -r 43a0556c994f configure.in
--- a/configure.in	Thu Nov 11 23:33:41 2004 +0000
+++ b/configure.in	Thu Nov 11 23:48:05 2004 +0000
@@ -236,6 +236,7 @@
       *-hpux*)
         # From H.Merijn Brand <h.m.brand@hccnet.nl>
         echo '#define pthread_attr_init(x) __pthread_attr_init_system(x)' >>confdefs.h
+        echo '#define pthread_create(x) __pthread_create_system(x)' >>confdefs.h
         ;;
       *-aix*)
         PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"
diff -r d2bf2d3b0173 -r 43a0556c994f lib/gftp.h
--- a/lib/gftp.h	Thu Nov 11 23:33:41 2004 +0000
+++ b/lib/gftp.h	Thu Nov 11 23:48:05 2004 +0000
@@ -161,7 +161,7 @@
 # define GFTP_LOG_FUNCTION_ATTRIBUTES
 #endif
 
-#if defined (_LARGEFILE_SOURCE)
+#if defined (_LARGEFILE_SOURCE) && !defined (__hppa__)
 #define GFTP_OFF_T_HEX_PRINTF_MOD	"%llx"
 #define GFTP_OFF_T_INTL_PRINTF_MOD	"%'lld"
 #define GFTP_OFF_T_PRINTF_MOD		"%lld"
diff -r d2bf2d3b0173 -r 43a0556c994f lib/protocols.c
--- a/lib/protocols.c	Thu Nov 11 23:33:41 2004 +0000
+++ b/lib/protocols.c	Thu Nov 11 23:48:05 2004 +0000
@@ -365,6 +365,7 @@
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
 
+#if ENABLE_NLS
   gftp_lookup_request_option (request, "remote_lc_time", &remote_lc_time);
   if (remote_lc_time != NULL && *remote_lc_time != '\0')
     locret = setlocale (LC_TIME, remote_lc_time);
@@ -378,6 +379,9 @@
                                  _("Error setting LC_TIME to '%s'. Falling back to '%s'\n"),
                                  remote_lc_time, locret);
     }
+#else
+  locret = _("<unknown>");
+#endif
 
   request->cached = 0;
   if (request->use_cache && (fd = gftp_find_cache_entry (request)) > 0)