← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to ext/oci8/php_oci8.h

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-16 09:09:50 UTC
  • mfrom: (1.1.18 upstream) (0.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable: 
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
  - Dropped debian/patches/libedit_is_editline.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/oci8/php_oci8.h
2
2
   +----------------------------------------------------------------------+
3
3
   | PHP Version 5                                                        |
4
4
   +----------------------------------------------------------------------+
5
 
   | Copyright (c) 1997-2009 The PHP Group                                |
 
5
   | Copyright (c) 1997-2010 The PHP Group                                |
6
6
   +----------------------------------------------------------------------+
7
7
   | This source file is subject to version 3.01 of the PHP license,      |
8
8
   | that is bundled with this package in the file LICENSE, and is        |
25
25
   +----------------------------------------------------------------------+
26
26
*/
27
27
 
28
 
/* $Id: php_oci8.h 277243 2009-03-16 05:44:49Z sixd $ */
 
28
/* $Id: php_oci8.h 294445 2010-02-03 20:00:49Z pajoye $ */
29
29
 
30
30
#if HAVE_OCI8
31
31
# ifndef PHP_OCI8_H
46
46
 */
47
47
#undef PHP_OCI8_VERSION
48
48
#endif
49
 
#define PHP_OCI8_VERSION "1.3.5"
 
49
#define PHP_OCI8_VERSION "1.4.1"
50
50
 
51
51
extern zend_module_entry oci8_module_entry;
52
52
#define phpext_oci8_ptr &oci8_module_entry