Revert the version changes until THRIFT-705 has been fixed

mkoppanen · Nov 23, 2011 · 99c6632 · 99c6632
1 parent 4f8195f
commit 99c6632
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/cassandra_driver.cpp b/cassandra_driver.cpp
@@ -656,7 +656,6 @@ PHP_MINFO_FUNCTION(pdo_cassandra)
 	php_info_print_table_start();
 	php_info_print_table_header(2, "PDO Driver for Cassandra", "enabled");
 	php_info_print_table_header(2, "PDO Driver for Cassandra version", PHP_PDO_CASSANDRA_EXTVER);
-	php_info_print_table_header(2, "PDO Driver for Cassandra thrift bindings version", PHP_PDO_CASSANDRA_THIRFTVER);
 	php_info_print_table_end();
 }
 /* }}} */

diff --git a/package.xml b/package.xml
@@ -35,10 +35,10 @@
    <file name="cassandra_statement.cpp" role="src"/>
 
    <!-- Headers -->
-   <file name="php_pdo_cassandra.hpp" role="src"/>
-   <file name="php_pdo_cassandra_int.hpp" role="src">
+   <file name="php_pdo_cassandra.hpp" role="src">
     <tasks:replace from="@PACKAGE_VERSION@" to="version" type="package-info" />
    </file>
+   <file name="php_pdo_cassandra_int.hpp" role="src"/>
 
    <!-- misc files -->
    <file name="README.md" role="doc" />

diff --git a/php_pdo_cassandra.hpp b/php_pdo_cassandra.hpp
@@ -25,6 +25,9 @@ extern "C" {
 #include "php.h"
 }
 
+#define PHP_PDO_CASSANDRA_EXTNAME "pdo_cassandra"
+#define PHP_PDO_CASSANDRA_EXTVER "@PACKAGE_VERSION@"
+
 extern zend_module_entry cassandra_module_entry;
 #define phpext_cassandra_ptr &cassandra_module_entry
 

diff --git a/php_pdo_cassandra_int.hpp b/php_pdo_cassandra_int.hpp
@@ -43,7 +43,6 @@ extern "C" {
 #undef HAVE_ZLIB
 
 #include "gen-cpp/Cassandra.h"
-#include "gen-cpp/cassandra_constants.h"
 #include <protocol/TBinaryProtocol.h>
 #include <transport/TSocketPool.h>
 #include <transport/TTransportUtils.h>
@@ -55,10 +54,6 @@ extern "C" {
 #include <iostream>
 #include <string>
 
-#define PHP_PDO_CASSANDRA_EXTNAME "pdo_cassandra"
-#define PHP_PDO_CASSANDRA_EXTVER "@PACKAGE_VERSION@"
-#define PHP_PDO_CASSANDRA_THRIFTVER g_cassandra_constants.VERSION.c_str()
-
 using namespace apache::thrift;
 using namespace apache::thrift::protocol;
 using namespace apache::thrift::transport;