# HG changeset patch
# User masneyb
# Date 1104499540 0
# Node ID eaede7f6c2f8cba3ec07a00aa6d86d37d0acf1f1
# Parent  86a110c13b8eeea9c152d9ceb0715ab143244afe
2004-12-31 Brian Masney <masneyb@gftp.org>

        * lib/gftp.h - when using HPUX, define the size of off_t as size long

        * configure.in - HPUX thread fixes

diff -r 86a110c13b8e -r eaede7f6c2f8 ChangeLog
--- a/ChangeLog	Fri Dec 24 11:26:52 2004 +0000
+++ b/ChangeLog	Fri Dec 31 13:25:40 2004 +0000
@@ -1,3 +1,8 @@
+2004-12-31 Brian Masney <masneyb@gftp.org>
+	* lib/gftp.h - when using HPUX, define the size of off_t as size long
+
+	* configure.in - HPUX thread fixes
+
 2004-12-24 Brian Masney <masneyb@gftp.org>
 	* src/gtk/chmod-dialog.c (dochmod) - fixes for the group execute
 	permission. If that checkbox was active, then write permissions for
@@ -3164,7 +3169,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.382 2004/12/24 11:26:52 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.383 2004/12/31 13:25:39 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 86a110c13b8e -r eaede7f6c2f8 configure.in
--- a/configure.in	Fri Dec 24 11:26:52 2004 +0000
+++ b/configure.in	Fri Dec 31 13:25:40 2004 +0000
@@ -205,6 +205,10 @@
     case $host in
       *-hpux*)
         AC_CHECK_LIB(rt, sem_init)
+
+        # 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
         ;;
     esac
 
@@ -233,11 +237,6 @@
 
     # I took some of these from the glib 1.3.3 configure.in
     case $host in
-      *-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"
         if test x"$GCC" = xyes; then
diff -r 86a110c13b8e -r eaede7f6c2f8 lib/gftp.h
--- a/lib/gftp.h	Fri Dec 24 11:26:52 2004 +0000
+++ b/lib/gftp.h	Fri Dec 31 13:25:40 2004 +0000
@@ -161,7 +161,7 @@
 # define GFTP_LOG_FUNCTION_ATTRIBUTES
 #endif
 
-#if defined (_LARGEFILE_SOURCE) && !defined (__hppa__)
+#if defined (_LARGEFILE_SOURCE) && !defined (__hppa__) && !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"