Merged PHP7 and PHP7 code - first step

Author: Ion Bazan

config.m4

@@ -35,9 +35,5 @@ if test "$PHP_TIMECOP" != "no"; then
     AC_MSG_RESULT([$PHP_VERSION])
   fi
 
-  if test "$PHP_MAJOR_VERSION" -eq 5; then
-    PHP_NEW_EXTENSION(timecop, timecop_php5.c tc_timeval.c, $ext_shared)
-  else
-    PHP_NEW_EXTENSION(timecop, timecop_php7.c tc_timeval.c, $ext_shared)
-  fi
+  PHP_NEW_EXTENSION(timecop, timecop.c tc_timeval.c, $ext_shared)
 fi

config.w32

@@ -4,10 +4,5 @@
 ARG_ENABLE("timecop", "enable timecop support", "no");
 
 if (PHP_TIMECOP != "no") {
-   if (PHP_VERSION <= 5) {
-      EXTENSION("timecop", "timecop_php5.c tc_timeval.c");
-   } else {
-      EXTENSION("timecop", "timecop_php7.c tc_timeval.c");
-   }
+    EXTENSION("timecop", "timecop.c tc_timeval.c");
 }
-

tc_timeval.c

@@ -26,11 +26,7 @@ SOFTWARE.
 
 int tc_timeval_add(tc_timeval *ret, const tc_timeval *arg1, const tc_timeval *arg2)
 {
-#if PHP_MAJOR_VERSION >= 7
 	zend_long sec, usec;
-#else
-	long sec, usec;
-#endif
 	usec = arg1->usec + arg2->usec;
 	sec  = arg1->sec + arg2->sec;
 	if (usec < 0) {
@@ -51,11 +47,7 @@ int tc_timeval_add(tc_timeval *ret, const tc_timeval *arg1, const tc_timeval *ar
 }
 int tc_timeval_sub(tc_timeval *ret, const tc_timeval *arg1, const tc_timeval *arg2)
 {
-#if PHP_MAJOR_VERSION >= 7
 	zend_long sec, usec;
-#else
-	long sec, usec;
-#endif
 	usec = arg1->usec - arg2->usec;
 	sec  = arg1->sec - arg2->sec;
 	if (usec < 0) {
@@ -75,17 +67,9 @@ int tc_timeval_sub(tc_timeval *ret, const tc_timeval *arg1, const tc_timeval *ar
 	return 0;
 }
 
-#if PHP_MAJOR_VERSION >= 7
 int tc_timeval_mul(tc_timeval *ret, const tc_timeval *arg1, const zend_long arg2)
-#else
-int tc_timeval_mul(tc_timeval *ret, const tc_timeval *arg1, const long arg2)
-#endif
 {
-#if PHP_MAJOR_VERSION >= 7
 	zend_long sec, usec;
-#else
-	long sec, usec;
-#endif
 	usec = arg1->usec * arg2;
 	sec  = arg1->sec * arg2;
 	if (usec < 0) {

tc_timeval.h

@@ -29,24 +29,19 @@ SOFTWARE.
 #  define USEC_PER_SEC 1000000
 #endif
 
+#if PHP_MAJOR_VERSION < 7
+typedef long zend_long;
+#endif
+
 typedef struct _tc_timeval {
-#if PHP_MAJOR_VERSION >= 7
 	zend_long sec;
 	zend_long usec;
-#else
-	long sec;
-	long usec;
-#endif
 } tc_timeval;
 
 
 int tc_timeval_add(tc_timeval *ret, const tc_timeval *arg1, const tc_timeval *arg2);
 int tc_timeval_sub(tc_timeval *ret, const tc_timeval *arg1, const tc_timeval *arg2);
-#if PHP_MAJOR_VERSION >= 7
 int tc_timeval_mul(tc_timeval *ret, const tc_timeval *arg1, const zend_long arg2);
-#else
-int tc_timeval_mul(tc_timeval *ret, const tc_timeval *arg1, const long arg2);
-#endif
 
 #endif	/* TC_TIMEVAL_H */