← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/apache2/jaunty-proposed

« back to all changes in this revision

Viewing changes to srclib/apr/dso/unix/dso.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-12-15 00:06:50 UTC
  • mfrom: (14.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20081215000650-5ovq2vvvrtmn5r1l
Tags: 2.2.11-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/{control, rules}: enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: add ufw profiles.

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr/dso/unix/dso.c
178
178
    int status;
179
179
 
180
180
    errno = 0;
181
 
    status = shl_findsym((shl_t *)&handle->handle, symname, TYPE_PROCEDURE, &symaddr);
 
181
    status = shl_findsym((void *)&handle->handle, symname, TYPE_PROCEDURE, &symaddr);
182
182
    if (status == -1 && errno == 0) /* try TYPE_DATA instead */
183
 
        status = shl_findsym((shl_t *)&handle->handle, symname, TYPE_DATA, &symaddr);
 
183
        status = shl_findsym((void *)&handle->handle, symname, TYPE_DATA, &symaddr);
184
184
    if (status == -1)
185
185
        return APR_ESYMNOTFOUND;
186
186
    *ressym = symaddr;