← Back to branch summary

~ubuntu-branches/debian/squeeze/netatalk/squeeze

« back to all changes in this revision

Viewing changes to sys/solaris/tpi.c

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-02-02 19:59:05 UTC
  • mfrom: (8.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090202195905-732t6wxk8jzsb91r
Tags: 2.0.4~beta2-4.1ubuntu1
https://launchpad.net/bugs/318665
https://launchpad.net/bugs/262991
* Merge from Debian unstable. Remaining Ubuntu changes: LP: #318665
  - Changed dependency from libdb-dev to libdb4.6-dev to correct
    FTBFS due to an issue caused by mismatches on installed binaries
    and development headers (db4.7 is installed under a different soname
    which breaks a check in netatalk) (LP: #262991)
  - debian/control:
    + Replace libltdl3-dev with libltdl7-dev.
    + Recommend db4.6-util instead of db4.2-util as we build netatalk with
      db4.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sys/solaris/tpi.c
36
36
    return( DDI_FAILURE );
37
37
}
38
38
 
 
39
/* Solaris 10 removed DDI_IDENTIFIED and replaced "identify" with "nulldev" */
 
40
#ifdef DDI_IDENTIFIED
39
41
    static int
40
42
tpi_identify( dev_info_t *dip )
41
43
{
49
51
        return( DDI_NOT_IDENTIFIED );
50
52
    }
51
53
}
 
54
#endif /* DDI_IDENTIFIED */
52
55
 
53
56
    static int
54
57
tpi_attach( dev_info_t *dip, ddi_attach_cmd_t cmd )
463
466
        }
464
467
        cp = (struct copyresp *)m->b_rptr;
465
468
        if ( cp->cp_rval != 0 ) {
466
 
            cmn_err( CE_CONT, "tpi_wput IOCDATA failed %d\n", cp->cp_rval );
 
469
            cmn_err( CE_CONT, "tpi_wput IOCDATA failed %s\n", cp->cp_rval );
467
470
            freemsg( m );
468
471
            break;
469
472
        }
701
704
    DEVO_REV,
702
705
    0,
703
706
    tpi_getinfo,
 
707
#ifdef DDI_IDENTIFIED
704
708
    tpi_identify,
 
709
#else
 
710
    nulldev,
 
711
#endif
705
712
    nulldev,
706
713
    tpi_attach,
707
714
    tpi_detach,