Merge branch 'master' into docs-fixes

Author: Bulat Shakirzyanov

Diff for: README.md

@@ -66,7 +66,7 @@ Cassandra's native protocol. The current version works with:
 
 * Apache Cassandra versions 1.2, 2.0 and partially 2.1
 * DataStax Enterprise 3.1, 3.2, 4.0 and 4.5
-* PHP 5.3+
+* PHP 5.3.4+
 * Compilers: GCC 4.1.2+, Clang 3.4+, and MSVC 2010/2012/2013
 
 __NOTE__: Apache Cassandra 2.1 support is limited to the Cassandra 2.0 API (native protocol v2), e.g. no user-defined types.

Diff for: ext/php_cassandra.h

@@ -22,6 +22,10 @@
 #include <Zend/zend_exceptions.h>
 #include <Zend/zend_interfaces.h>
 
+#if PHP_VERSION_ID < 50304
+#  error PHP 5.3.4 or later is required in order to build the driver
+#endif
+
 #if HAVE_SPL
 #  include <ext/spl/spl_iterators.h>
 #  include <ext/spl/spl_exceptions.h>

Diff for: ext/util/future.h

@@ -1,7 +1,7 @@
-#ifndef PHP_CASSANDRA_FUTURE_H
-#define PHP_CASSANDRA_FUTURE_H
+#ifndef PHP_CASSANDRA_UTIL_FUTURE_H
+#define PHP_CASSANDRA_UTIL_FUTURE_H
 
 int  php_cassandra_future_wait_timed(CassFuture* future, zval* timeout TSRMLS_DC);
 int  php_cassandra_future_is_error(CassFuture* future TSRMLS_DC);
 
-#endif /* PHP_CASSANDRA_FUTURE_H */
+#endif /* PHP_CASSANDRA_UTIL_FUTURE_H */