view hercules.patch @ 6:4b740bf0d945

update
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Mon, 04 Aug 2014 17:40:23 -0400
parents adc0911de0f7
children
line wrap: on
line source

diff --git a/autogen.sh b/autogen.sh
index c4771a1..1c1ead5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,9 +17,9 @@ EOF
 
 rm -f autogen.log
 
-echo $ECHO_N "aclocal...    $ECHO_C" && aclocal -I m4 -I autoconf >>./autogen.log 2>&1 && echo "OK.  (25% done)" &&
+echo $ECHO_N "aclocal...    $ECHO_C" && aclocal-1.10 -I m4 -I autoconf >>./autogen.log 2>&1 && echo "OK.  (25% done)" &&
 echo $ECHO_N "autoheader... $ECHO_C" && autoheader                >>./autogen.log 2>&1 && echo "OK.  (50% done)" &&
-echo $ECHO_N "automake...   $ECHO_C" && automake --add-missing    >>./autogen.log 2>&1 && echo "OK.  (75% done)" &&
+echo $ECHO_N "automake...   $ECHO_C" && automake-1.10 --add-missing    >>./autogen.log 2>&1 && echo "OK.  (75% done)" &&
 echo $ECHO_N "autoconf...   $ECHO_C" && autoconf                  >>./autogen.log 2>&1 && echo "OK.  (100% done)"
 
 R=$?
diff --git a/ctc_ptp.c b/ctc_ptp.c
index d48b1b3..7da0e3a 100644
--- a/ctc_ptp.c
+++ b/ctc_ptp.c
@@ -14,6 +14,7 @@
 /* 0E20-0E21 PTP <optional parameters>                                */
 /* See README.NETWORKING for details.                                 */
 
+#include <sys/sockio.h>
 #include "hstdinc.h"
 #include "hercules.h"
 #include "ctcadpt.h"
diff --git a/hifr.h b/hifr.h
index 54258b3..229a75f 100644
--- a/hifr.h
+++ b/hifr.h
@@ -109,7 +109,7 @@ struct hifr
 };
 typedef struct hifr hifr;
 
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__)
   #define  hifr_name       ifreq.ifr_name
 #else
   #define  hifr_name       ifreq.ifr_ifrn.ifrn_name
diff --git a/qeth.c b/qeth.c
index e3f2a9a..f05adc1 100644
--- a/qeth.c
+++ b/qeth.c
@@ -227,7 +227,7 @@ static BYTE qeth_immed_commands [256] =
 #define QDSIG_WRIT      5       /* SIGA Initiate Output              */
 #define QDSIG_WRMULT    6       /* SIGA Initiate Output Multiple     */
 
-static const char* sig2str( BYTE sig ) {
+static const char* qsig2str( BYTE sig ) {
     static const char* sigstr[] = {
     /*0*/ "QDSIG_RESET",
     /*1*/ "QDSIG_HALT",
@@ -3615,7 +3615,7 @@ U32 num;                                /* Number of bytes to move   */
             {
                 sig = QDSIG_RESET;
                 VERIFY( qeth_read_pipe( grp->ppfd[0], &sig ) == 1);
-                DBGTRC( dev, "Activate Queues: %s received\n", sig2str( sig ));
+                DBGTRC( dev, "Activate Queues: %s received\n", qsig2str( sig ));
 
                 /* Exit immediately when requested to do so */
                 if (QDSIG_HALT == sig)
@@ -3810,7 +3810,7 @@ int noselrd, rc = 0;
         if(noselrd && dev->qdio.i_qmask)
         {
             BYTE sig = QDSIG_READ;
-            DBGTRC( dev, "SIGA-r: sending %s\n", sig2str( sig ));
+            DBGTRC( dev, "SIGA-r: sending %s\n", qsig2str( sig ));
             VERIFY( qeth_write_pipe( grp->ppfd[1], &sig ) == 1);
         }
     }
@@ -3851,7 +3851,7 @@ OSA_GRP *grp = (OSA_GRP*)dev->group->grp_data;
     /* Send signal to ACTIVATE QUEUES device thread loop */
     if(dev->qdio.o_qmask)
     {
-        DBGTRC( dev, "SIGA-o: sending %s\n", sig2str( sig ));
+        DBGTRC( dev, "SIGA-o: sending %s\n", qsig2str( sig ));
         VERIFY( qeth_write_pipe( grp->ppfd[1], &sig ) == 1);
     }