postgrespro
diff --git a/‎contrib/btree_gist/btree_time.c
Lines changed: 0 additions & 8 deletions b/‎contrib/btree_gist/btree_time.c
Lines changed: 0 additions & 8 deletions
diff --git a/‎contrib/btree_gist/btree_ts.c
Lines changed: 0 additions & 8 deletions b/‎contrib/btree_gist/btree_ts.c
Lines changed: 0 additions & 8 deletions
diff --git a/‎contrib/btree_gist/btree_utils_num.h
Lines changed: 0 additions & 7 deletions b/‎contrib/btree_gist/btree_utils_num.h
Lines changed: 0 additions & 7 deletions
diff --git a/‎src/backend/commands/variable.c
Lines changed: 0 additions & 4 deletions b/‎src/backend/commands/variable.c
Lines changed: 0 additions & 4 deletions
@@ -179,11 +179,7 @@ gbt_timetz_compress(PG_FUNCTION_ARGS)
 		retval = palloc(sizeof(GISTENTRY));
 
 		/* We are using the time + zone only to compress */
-#ifdef HAVE_INT64_TIMESTAMP
 		tmp = tz->time + (tz->zone * INT64CONST(1000000));
-#else
-		tmp = (tz->time + tz->zone);
-#endif
 		r->lower = r->upper = tmp;
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
@@ -259,11 +255,7 @@ gbt_timetz_consistent(PG_FUNCTION_ARGS)
 	/* All cases served by this function are inexact */
 	*recheck = true;
 
-#ifdef HAVE_INT64_TIMESTAMP
 	qqq = query->time + (query->zone * INT64CONST(1000000));
-#else
-	qqq = (query->time + query->zone);
-#endif
 
 	key.lower = (GBT_NUMKEY *) &kkk->lower;
 	key.upper = (GBT_NUMKEY *) &kkk->upper;
 
@@ -153,11 +153,7 @@ ts_dist(PG_FUNCTION_ARGS)
 
 		p->day = INT_MAX;
 		p->month = INT_MAX;
-#ifdef HAVE_INT64_TIMESTAMP
 		p->time = PG_INT64_MAX;
-#else
-		p->time = DBL_MAX;
-#endif
 		PG_RETURN_INTERVAL_P(p);
 	}
 	else
@@ -181,11 +177,7 @@ tstz_dist(PG_FUNCTION_ARGS)
 
 		p->day = INT_MAX;
 		p->month = INT_MAX;
-#ifdef HAVE_INT64_TIMESTAMP
 		p->time = PG_INT64_MAX;
-#else
-		p->time = DBL_MAX;
-#endif
 		PG_RETURN_INTERVAL_P(p);
 	}
 
 
@@ -82,17 +82,10 @@ typedef struct
  * (as a double).  Here because we need it for time/timetz as well as
  * interval.  See interval_cmp_internal for comparison.
  */
-#ifdef HAVE_INT64_TIMESTAMP
 #define INTERVAL_TO_SEC(ivp) \
 	(((double) (ivp)->time) / ((double) USECS_PER_SEC) + \
 	 (ivp)->day * (24.0 * SECS_PER_HOUR) + \
 	 (ivp)->month * (30.0 * SECS_PER_DAY))
-#else
-#define INTERVAL_TO_SEC(ivp) \
-	((ivp)->time + \
-	 (ivp)->day * (24.0 * SECS_PER_HOUR) + \
-	 (ivp)->month * (30.0 * SECS_PER_DAY))
-#endif
 
 #define GET_FLOAT_DISTANCE(t, arg1, arg2)	Abs( ((float8) *((const t *) (arg1))) - ((float8) *((const t *) (arg2))) )
 
 
@@ -308,11 +308,7 @@ check_timezone(char **newval, void **extra, GucSource source)
 		}
 
 		/* Here we change from SQL to Unix sign convention */
-#ifdef HAVE_INT64_TIMESTAMP
 		gmtoffset = -(interval->time / USECS_PER_SEC);
-#else
-		gmtoffset = -interval->time;
-#endif
 		new_tz = pg_tzset_offset(gmtoffset);
 
 		pfree(interval);