← Back to branch summary

~james-page/ubuntu/natty/tomcat6/fix-662588

« back to all changes in this revision

Viewing changes to native/connector/os/unix/system.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug, Iulian Udrea
  • Date: 2009-06-09 12:35:19 UTC
  • mfrom: (1.2.1 upstream) (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090609123519-7owjbso5ttnka6ur
Tags: 6.0.20-1ubuntu1
https://launchpad.net/bugs/385262
[ Iulian Udrea ]
* Merge from debian unstable (LP: #385262), remaining changes:
  - debian/control, debian/rules: Use default-jdk to build
  - debian/control: Run using default-jre-headless by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
native/connector/os/unix/system.c
17
17
/*
18
18
 *
19
19
 * @author Mladen Turk
20
 
 * @version $Revision: 523564 $, $Date: 2007-03-29 07:22:47 +0200 (Thu, 29 Mar 2007) $
 
20
 * @version $Revision: 708867 $, $Date: 2008-10-29 11:39:16 +0100 (Wed, 29 Oct 2008) $
21
21
 */
22
22
 
23
23
#include "apr.h"
99
99
    else if (type == 7)
100
100
        return JNI_TRUE;
101
101
#endif
 
102
#if defined(__APPLE__) || defined(DARWIN)
 
103
    else if (type == 8)
 
104
        return JNI_TRUE;
 
105
#endif
102
106
    else
103
107
        return JNI_FALSE;
104
108
}