From 28a898ad54a7fdf76aba835ab600222f25321484 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 23 Apr 2002 15:45:30 +0000 Subject: [PATCH] Clean up INT64CONST conflicts. Make the pg_crc code use a macro called UINT64CONST, since unsigned was what it wanted anyway. Centralize macro definitions into c.h. --- src/backend/utils/adt/int8.c | 13 +- src/backend/utils/hash/pg_crc.c | 258 ++++++++++++++++---------------- src/include/c.h | 13 +- src/include/utils/date.h | 3 +- src/include/utils/int8.h | 10 +- src/include/utils/pg_crc.h | 13 +- src/include/utils/timestamp.h | 21 ++- 7 files changed, 161 insertions(+), 170 deletions(-) diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 685d5e34398..8e3451b3c5a 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.38 2002/04/21 19:48:12 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.39 2002/04/23 15:45:30 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -21,17 +21,6 @@ #include "utils/int8.h" -/* this should be set in pg_config.h, but just in case it wasn't: */ -#ifndef INT64_FORMAT -#warning "Broken pg_config.h should have defined INT64_FORMAT" -#define INT64_FORMAT "%ld" -#endif - -#ifdef HAVE_LL_CONSTANTS -#define INT64CONST(x) ((int64) x##LL) -#else -#define INT64CONST(x) ((int64) x) -#endif #define MAXINT8LEN 25 diff --git a/src/backend/utils/hash/pg_crc.c b/src/backend/utils/hash/pg_crc.c index 62b1b106b80..336ef51ed18 100644 --- a/src/backend/utils/hash/pg_crc.c +++ b/src/backend/utils/hash/pg_crc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.6 2001/11/05 17:46:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/pg_crc.c,v 1.7 2002/04/23 15:45:30 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -284,134 +284,134 @@ const uint32 crc_table1[256] = { #else /* int64 works */ const uint64 crc_table[256] = { - INT64CONST(0x0000000000000000), INT64CONST(0x42F0E1EBA9EA3693), - INT64CONST(0x85E1C3D753D46D26), INT64CONST(0xC711223CFA3E5BB5), - INT64CONST(0x493366450E42ECDF), INT64CONST(0x0BC387AEA7A8DA4C), - INT64CONST(0xCCD2A5925D9681F9), INT64CONST(0x8E224479F47CB76A), - INT64CONST(0x9266CC8A1C85D9BE), INT64CONST(0xD0962D61B56FEF2D), - INT64CONST(0x17870F5D4F51B498), INT64CONST(0x5577EEB6E6BB820B), - INT64CONST(0xDB55AACF12C73561), INT64CONST(0x99A54B24BB2D03F2), - INT64CONST(0x5EB4691841135847), INT64CONST(0x1C4488F3E8F96ED4), - INT64CONST(0x663D78FF90E185EF), INT64CONST(0x24CD9914390BB37C), - INT64CONST(0xE3DCBB28C335E8C9), INT64CONST(0xA12C5AC36ADFDE5A), - INT64CONST(0x2F0E1EBA9EA36930), INT64CONST(0x6DFEFF5137495FA3), - INT64CONST(0xAAEFDD6DCD770416), INT64CONST(0xE81F3C86649D3285), - INT64CONST(0xF45BB4758C645C51), INT64CONST(0xB6AB559E258E6AC2), - INT64CONST(0x71BA77A2DFB03177), INT64CONST(0x334A9649765A07E4), - INT64CONST(0xBD68D2308226B08E), INT64CONST(0xFF9833DB2BCC861D), - INT64CONST(0x388911E7D1F2DDA8), INT64CONST(0x7A79F00C7818EB3B), - INT64CONST(0xCC7AF1FF21C30BDE), INT64CONST(0x8E8A101488293D4D), - INT64CONST(0x499B3228721766F8), INT64CONST(0x0B6BD3C3DBFD506B), - INT64CONST(0x854997BA2F81E701), INT64CONST(0xC7B97651866BD192), - INT64CONST(0x00A8546D7C558A27), INT64CONST(0x4258B586D5BFBCB4), - INT64CONST(0x5E1C3D753D46D260), INT64CONST(0x1CECDC9E94ACE4F3), - INT64CONST(0xDBFDFEA26E92BF46), INT64CONST(0x990D1F49C77889D5), - INT64CONST(0x172F5B3033043EBF), INT64CONST(0x55DFBADB9AEE082C), - INT64CONST(0x92CE98E760D05399), INT64CONST(0xD03E790CC93A650A), - INT64CONST(0xAA478900B1228E31), INT64CONST(0xE8B768EB18C8B8A2), - INT64CONST(0x2FA64AD7E2F6E317), INT64CONST(0x6D56AB3C4B1CD584), - INT64CONST(0xE374EF45BF6062EE), INT64CONST(0xA1840EAE168A547D), - INT64CONST(0x66952C92ECB40FC8), INT64CONST(0x2465CD79455E395B), - INT64CONST(0x3821458AADA7578F), INT64CONST(0x7AD1A461044D611C), - INT64CONST(0xBDC0865DFE733AA9), INT64CONST(0xFF3067B657990C3A), - INT64CONST(0x711223CFA3E5BB50), INT64CONST(0x33E2C2240A0F8DC3), - INT64CONST(0xF4F3E018F031D676), INT64CONST(0xB60301F359DBE0E5), - INT64CONST(0xDA050215EA6C212F), INT64CONST(0x98F5E3FE438617BC), - INT64CONST(0x5FE4C1C2B9B84C09), INT64CONST(0x1D14202910527A9A), - INT64CONST(0x93366450E42ECDF0), INT64CONST(0xD1C685BB4DC4FB63), - INT64CONST(0x16D7A787B7FAA0D6), INT64CONST(0x5427466C1E109645), - INT64CONST(0x4863CE9FF6E9F891), INT64CONST(0x0A932F745F03CE02), - INT64CONST(0xCD820D48A53D95B7), INT64CONST(0x8F72ECA30CD7A324), - INT64CONST(0x0150A8DAF8AB144E), INT64CONST(0x43A04931514122DD), - INT64CONST(0x84B16B0DAB7F7968), INT64CONST(0xC6418AE602954FFB), - INT64CONST(0xBC387AEA7A8DA4C0), INT64CONST(0xFEC89B01D3679253), - INT64CONST(0x39D9B93D2959C9E6), INT64CONST(0x7B2958D680B3FF75), - INT64CONST(0xF50B1CAF74CF481F), INT64CONST(0xB7FBFD44DD257E8C), - INT64CONST(0x70EADF78271B2539), INT64CONST(0x321A3E938EF113AA), - INT64CONST(0x2E5EB66066087D7E), INT64CONST(0x6CAE578BCFE24BED), - INT64CONST(0xABBF75B735DC1058), INT64CONST(0xE94F945C9C3626CB), - INT64CONST(0x676DD025684A91A1), INT64CONST(0x259D31CEC1A0A732), - INT64CONST(0xE28C13F23B9EFC87), INT64CONST(0xA07CF2199274CA14), - INT64CONST(0x167FF3EACBAF2AF1), INT64CONST(0x548F120162451C62), - INT64CONST(0x939E303D987B47D7), INT64CONST(0xD16ED1D631917144), - INT64CONST(0x5F4C95AFC5EDC62E), INT64CONST(0x1DBC74446C07F0BD), - INT64CONST(0xDAAD56789639AB08), INT64CONST(0x985DB7933FD39D9B), - INT64CONST(0x84193F60D72AF34F), INT64CONST(0xC6E9DE8B7EC0C5DC), - INT64CONST(0x01F8FCB784FE9E69), INT64CONST(0x43081D5C2D14A8FA), - INT64CONST(0xCD2A5925D9681F90), INT64CONST(0x8FDAB8CE70822903), - INT64CONST(0x48CB9AF28ABC72B6), INT64CONST(0x0A3B7B1923564425), - INT64CONST(0x70428B155B4EAF1E), INT64CONST(0x32B26AFEF2A4998D), - INT64CONST(0xF5A348C2089AC238), INT64CONST(0xB753A929A170F4AB), - INT64CONST(0x3971ED50550C43C1), INT64CONST(0x7B810CBBFCE67552), - INT64CONST(0xBC902E8706D82EE7), INT64CONST(0xFE60CF6CAF321874), - INT64CONST(0xE224479F47CB76A0), INT64CONST(0xA0D4A674EE214033), - INT64CONST(0x67C58448141F1B86), INT64CONST(0x253565A3BDF52D15), - INT64CONST(0xAB1721DA49899A7F), INT64CONST(0xE9E7C031E063ACEC), - INT64CONST(0x2EF6E20D1A5DF759), INT64CONST(0x6C0603E6B3B7C1CA), - INT64CONST(0xF6FAE5C07D3274CD), INT64CONST(0xB40A042BD4D8425E), - INT64CONST(0x731B26172EE619EB), INT64CONST(0x31EBC7FC870C2F78), - INT64CONST(0xBFC9838573709812), INT64CONST(0xFD39626EDA9AAE81), - INT64CONST(0x3A28405220A4F534), INT64CONST(0x78D8A1B9894EC3A7), - INT64CONST(0x649C294A61B7AD73), INT64CONST(0x266CC8A1C85D9BE0), - INT64CONST(0xE17DEA9D3263C055), INT64CONST(0xA38D0B769B89F6C6), - INT64CONST(0x2DAF4F0F6FF541AC), INT64CONST(0x6F5FAEE4C61F773F), - INT64CONST(0xA84E8CD83C212C8A), INT64CONST(0xEABE6D3395CB1A19), - INT64CONST(0x90C79D3FEDD3F122), INT64CONST(0xD2377CD44439C7B1), - INT64CONST(0x15265EE8BE079C04), INT64CONST(0x57D6BF0317EDAA97), - INT64CONST(0xD9F4FB7AE3911DFD), INT64CONST(0x9B041A914A7B2B6E), - INT64CONST(0x5C1538ADB04570DB), INT64CONST(0x1EE5D94619AF4648), - INT64CONST(0x02A151B5F156289C), INT64CONST(0x4051B05E58BC1E0F), - INT64CONST(0x87409262A28245BA), INT64CONST(0xC5B073890B687329), - INT64CONST(0x4B9237F0FF14C443), INT64CONST(0x0962D61B56FEF2D0), - INT64CONST(0xCE73F427ACC0A965), INT64CONST(0x8C8315CC052A9FF6), - INT64CONST(0x3A80143F5CF17F13), INT64CONST(0x7870F5D4F51B4980), - INT64CONST(0xBF61D7E80F251235), INT64CONST(0xFD913603A6CF24A6), - INT64CONST(0x73B3727A52B393CC), INT64CONST(0x31439391FB59A55F), - INT64CONST(0xF652B1AD0167FEEA), INT64CONST(0xB4A25046A88DC879), - INT64CONST(0xA8E6D8B54074A6AD), INT64CONST(0xEA16395EE99E903E), - INT64CONST(0x2D071B6213A0CB8B), INT64CONST(0x6FF7FA89BA4AFD18), - INT64CONST(0xE1D5BEF04E364A72), INT64CONST(0xA3255F1BE7DC7CE1), - INT64CONST(0x64347D271DE22754), INT64CONST(0x26C49CCCB40811C7), - INT64CONST(0x5CBD6CC0CC10FAFC), INT64CONST(0x1E4D8D2B65FACC6F), - INT64CONST(0xD95CAF179FC497DA), INT64CONST(0x9BAC4EFC362EA149), - INT64CONST(0x158E0A85C2521623), INT64CONST(0x577EEB6E6BB820B0), - INT64CONST(0x906FC95291867B05), INT64CONST(0xD29F28B9386C4D96), - INT64CONST(0xCEDBA04AD0952342), INT64CONST(0x8C2B41A1797F15D1), - INT64CONST(0x4B3A639D83414E64), INT64CONST(0x09CA82762AAB78F7), - INT64CONST(0x87E8C60FDED7CF9D), INT64CONST(0xC51827E4773DF90E), - INT64CONST(0x020905D88D03A2BB), INT64CONST(0x40F9E43324E99428), - INT64CONST(0x2CFFE7D5975E55E2), INT64CONST(0x6E0F063E3EB46371), - INT64CONST(0xA91E2402C48A38C4), INT64CONST(0xEBEEC5E96D600E57), - INT64CONST(0x65CC8190991CB93D), INT64CONST(0x273C607B30F68FAE), - INT64CONST(0xE02D4247CAC8D41B), INT64CONST(0xA2DDA3AC6322E288), - INT64CONST(0xBE992B5F8BDB8C5C), INT64CONST(0xFC69CAB42231BACF), - INT64CONST(0x3B78E888D80FE17A), INT64CONST(0x7988096371E5D7E9), - INT64CONST(0xF7AA4D1A85996083), INT64CONST(0xB55AACF12C735610), - INT64CONST(0x724B8ECDD64D0DA5), INT64CONST(0x30BB6F267FA73B36), - INT64CONST(0x4AC29F2A07BFD00D), INT64CONST(0x08327EC1AE55E69E), - INT64CONST(0xCF235CFD546BBD2B), INT64CONST(0x8DD3BD16FD818BB8), - INT64CONST(0x03F1F96F09FD3CD2), INT64CONST(0x41011884A0170A41), - INT64CONST(0x86103AB85A2951F4), INT64CONST(0xC4E0DB53F3C36767), - INT64CONST(0xD8A453A01B3A09B3), INT64CONST(0x9A54B24BB2D03F20), - INT64CONST(0x5D45907748EE6495), INT64CONST(0x1FB5719CE1045206), - INT64CONST(0x919735E51578E56C), INT64CONST(0xD367D40EBC92D3FF), - INT64CONST(0x1476F63246AC884A), INT64CONST(0x568617D9EF46BED9), - INT64CONST(0xE085162AB69D5E3C), INT64CONST(0xA275F7C11F7768AF), - INT64CONST(0x6564D5FDE549331A), INT64CONST(0x279434164CA30589), - INT64CONST(0xA9B6706FB8DFB2E3), INT64CONST(0xEB46918411358470), - INT64CONST(0x2C57B3B8EB0BDFC5), INT64CONST(0x6EA7525342E1E956), - INT64CONST(0x72E3DAA0AA188782), INT64CONST(0x30133B4B03F2B111), - INT64CONST(0xF7021977F9CCEAA4), INT64CONST(0xB5F2F89C5026DC37), - INT64CONST(0x3BD0BCE5A45A6B5D), INT64CONST(0x79205D0E0DB05DCE), - INT64CONST(0xBE317F32F78E067B), INT64CONST(0xFCC19ED95E6430E8), - INT64CONST(0x86B86ED5267CDBD3), INT64CONST(0xC4488F3E8F96ED40), - INT64CONST(0x0359AD0275A8B6F5), INT64CONST(0x41A94CE9DC428066), - INT64CONST(0xCF8B0890283E370C), INT64CONST(0x8D7BE97B81D4019F), - INT64CONST(0x4A6ACB477BEA5A2A), INT64CONST(0x089A2AACD2006CB9), - INT64CONST(0x14DEA25F3AF9026D), INT64CONST(0x562E43B4931334FE), - INT64CONST(0x913F6188692D6F4B), INT64CONST(0xD3CF8063C0C759D8), - INT64CONST(0x5DEDC41A34BBEEB2), INT64CONST(0x1F1D25F19D51D821), - INT64CONST(0xD80C07CD676F8394), INT64CONST(0x9AFCE626CE85B507) + UINT64CONST(0x0000000000000000), UINT64CONST(0x42F0E1EBA9EA3693), + UINT64CONST(0x85E1C3D753D46D26), UINT64CONST(0xC711223CFA3E5BB5), + UINT64CONST(0x493366450E42ECDF), UINT64CONST(0x0BC387AEA7A8DA4C), + UINT64CONST(0xCCD2A5925D9681F9), UINT64CONST(0x8E224479F47CB76A), + UINT64CONST(0x9266CC8A1C85D9BE), UINT64CONST(0xD0962D61B56FEF2D), + UINT64CONST(0x17870F5D4F51B498), UINT64CONST(0x5577EEB6E6BB820B), + UINT64CONST(0xDB55AACF12C73561), UINT64CONST(0x99A54B24BB2D03F2), + UINT64CONST(0x5EB4691841135847), UINT64CONST(0x1C4488F3E8F96ED4), + UINT64CONST(0x663D78FF90E185EF), UINT64CONST(0x24CD9914390BB37C), + UINT64CONST(0xE3DCBB28C335E8C9), UINT64CONST(0xA12C5AC36ADFDE5A), + UINT64CONST(0x2F0E1EBA9EA36930), UINT64CONST(0x6DFEFF5137495FA3), + UINT64CONST(0xAAEFDD6DCD770416), UINT64CONST(0xE81F3C86649D3285), + UINT64CONST(0xF45BB4758C645C51), UINT64CONST(0xB6AB559E258E6AC2), + UINT64CONST(0x71BA77A2DFB03177), UINT64CONST(0x334A9649765A07E4), + UINT64CONST(0xBD68D2308226B08E), UINT64CONST(0xFF9833DB2BCC861D), + UINT64CONST(0x388911E7D1F2DDA8), UINT64CONST(0x7A79F00C7818EB3B), + UINT64CONST(0xCC7AF1FF21C30BDE), UINT64CONST(0x8E8A101488293D4D), + UINT64CONST(0x499B3228721766F8), UINT64CONST(0x0B6BD3C3DBFD506B), + UINT64CONST(0x854997BA2F81E701), UINT64CONST(0xC7B97651866BD192), + UINT64CONST(0x00A8546D7C558A27), UINT64CONST(0x4258B586D5BFBCB4), + UINT64CONST(0x5E1C3D753D46D260), UINT64CONST(0x1CECDC9E94ACE4F3), + UINT64CONST(0xDBFDFEA26E92BF46), UINT64CONST(0x990D1F49C77889D5), + UINT64CONST(0x172F5B3033043EBF), UINT64CONST(0x55DFBADB9AEE082C), + UINT64CONST(0x92CE98E760D05399), UINT64CONST(0xD03E790CC93A650A), + UINT64CONST(0xAA478900B1228E31), UINT64CONST(0xE8B768EB18C8B8A2), + UINT64CONST(0x2FA64AD7E2F6E317), UINT64CONST(0x6D56AB3C4B1CD584), + UINT64CONST(0xE374EF45BF6062EE), UINT64CONST(0xA1840EAE168A547D), + UINT64CONST(0x66952C92ECB40FC8), UINT64CONST(0x2465CD79455E395B), + UINT64CONST(0x3821458AADA7578F), UINT64CONST(0x7AD1A461044D611C), + UINT64CONST(0xBDC0865DFE733AA9), UINT64CONST(0xFF3067B657990C3A), + UINT64CONST(0x711223CFA3E5BB50), UINT64CONST(0x33E2C2240A0F8DC3), + UINT64CONST(0xF4F3E018F031D676), UINT64CONST(0xB60301F359DBE0E5), + UINT64CONST(0xDA050215EA6C212F), UINT64CONST(0x98F5E3FE438617BC), + UINT64CONST(0x5FE4C1C2B9B84C09), UINT64CONST(0x1D14202910527A9A), + UINT64CONST(0x93366450E42ECDF0), UINT64CONST(0xD1C685BB4DC4FB63), + UINT64CONST(0x16D7A787B7FAA0D6), UINT64CONST(0x5427466C1E109645), + UINT64CONST(0x4863CE9FF6E9F891), UINT64CONST(0x0A932F745F03CE02), + UINT64CONST(0xCD820D48A53D95B7), UINT64CONST(0x8F72ECA30CD7A324), + UINT64CONST(0x0150A8DAF8AB144E), UINT64CONST(0x43A04931514122DD), + UINT64CONST(0x84B16B0DAB7F7968), UINT64CONST(0xC6418AE602954FFB), + UINT64CONST(0xBC387AEA7A8DA4C0), UINT64CONST(0xFEC89B01D3679253), + UINT64CONST(0x39D9B93D2959C9E6), UINT64CONST(0x7B2958D680B3FF75), + UINT64CONST(0xF50B1CAF74CF481F), UINT64CONST(0xB7FBFD44DD257E8C), + UINT64CONST(0x70EADF78271B2539), UINT64CONST(0x321A3E938EF113AA), + UINT64CONST(0x2E5EB66066087D7E), UINT64CONST(0x6CAE578BCFE24BED), + UINT64CONST(0xABBF75B735DC1058), UINT64CONST(0xE94F945C9C3626CB), + UINT64CONST(0x676DD025684A91A1), UINT64CONST(0x259D31CEC1A0A732), + UINT64CONST(0xE28C13F23B9EFC87), UINT64CONST(0xA07CF2199274CA14), + UINT64CONST(0x167FF3EACBAF2AF1), UINT64CONST(0x548F120162451C62), + UINT64CONST(0x939E303D987B47D7), UINT64CONST(0xD16ED1D631917144), + UINT64CONST(0x5F4C95AFC5EDC62E), UINT64CONST(0x1DBC74446C07F0BD), + UINT64CONST(0xDAAD56789639AB08), UINT64CONST(0x985DB7933FD39D9B), + UINT64CONST(0x84193F60D72AF34F), UINT64CONST(0xC6E9DE8B7EC0C5DC), + UINT64CONST(0x01F8FCB784FE9E69), UINT64CONST(0x43081D5C2D14A8FA), + UINT64CONST(0xCD2A5925D9681F90), UINT64CONST(0x8FDAB8CE70822903), + UINT64CONST(0x48CB9AF28ABC72B6), UINT64CONST(0x0A3B7B1923564425), + UINT64CONST(0x70428B155B4EAF1E), UINT64CONST(0x32B26AFEF2A4998D), + UINT64CONST(0xF5A348C2089AC238), UINT64CONST(0xB753A929A170F4AB), + UINT64CONST(0x3971ED50550C43C1), UINT64CONST(0x7B810CBBFCE67552), + UINT64CONST(0xBC902E8706D82EE7), UINT64CONST(0xFE60CF6CAF321874), + UINT64CONST(0xE224479F47CB76A0), UINT64CONST(0xA0D4A674EE214033), + UINT64CONST(0x67C58448141F1B86), UINT64CONST(0x253565A3BDF52D15), + UINT64CONST(0xAB1721DA49899A7F), UINT64CONST(0xE9E7C031E063ACEC), + UINT64CONST(0x2EF6E20D1A5DF759), UINT64CONST(0x6C0603E6B3B7C1CA), + UINT64CONST(0xF6FAE5C07D3274CD), UINT64CONST(0xB40A042BD4D8425E), + UINT64CONST(0x731B26172EE619EB), UINT64CONST(0x31EBC7FC870C2F78), + UINT64CONST(0xBFC9838573709812), UINT64CONST(0xFD39626EDA9AAE81), + UINT64CONST(0x3A28405220A4F534), UINT64CONST(0x78D8A1B9894EC3A7), + UINT64CONST(0x649C294A61B7AD73), UINT64CONST(0x266CC8A1C85D9BE0), + UINT64CONST(0xE17DEA9D3263C055), UINT64CONST(0xA38D0B769B89F6C6), + UINT64CONST(0x2DAF4F0F6FF541AC), UINT64CONST(0x6F5FAEE4C61F773F), + UINT64CONST(0xA84E8CD83C212C8A), UINT64CONST(0xEABE6D3395CB1A19), + UINT64CONST(0x90C79D3FEDD3F122), UINT64CONST(0xD2377CD44439C7B1), + UINT64CONST(0x15265EE8BE079C04), UINT64CONST(0x57D6BF0317EDAA97), + UINT64CONST(0xD9F4FB7AE3911DFD), UINT64CONST(0x9B041A914A7B2B6E), + UINT64CONST(0x5C1538ADB04570DB), UINT64CONST(0x1EE5D94619AF4648), + UINT64CONST(0x02A151B5F156289C), UINT64CONST(0x4051B05E58BC1E0F), + UINT64CONST(0x87409262A28245BA), UINT64CONST(0xC5B073890B687329), + UINT64CONST(0x4B9237F0FF14C443), UINT64CONST(0x0962D61B56FEF2D0), + UINT64CONST(0xCE73F427ACC0A965), UINT64CONST(0x8C8315CC052A9FF6), + UINT64CONST(0x3A80143F5CF17F13), UINT64CONST(0x7870F5D4F51B4980), + UINT64CONST(0xBF61D7E80F251235), UINT64CONST(0xFD913603A6CF24A6), + UINT64CONST(0x73B3727A52B393CC), UINT64CONST(0x31439391FB59A55F), + UINT64CONST(0xF652B1AD0167FEEA), UINT64CONST(0xB4A25046A88DC879), + UINT64CONST(0xA8E6D8B54074A6AD), UINT64CONST(0xEA16395EE99E903E), + UINT64CONST(0x2D071B6213A0CB8B), UINT64CONST(0x6FF7FA89BA4AFD18), + UINT64CONST(0xE1D5BEF04E364A72), UINT64CONST(0xA3255F1BE7DC7CE1), + UINT64CONST(0x64347D271DE22754), UINT64CONST(0x26C49CCCB40811C7), + UINT64CONST(0x5CBD6CC0CC10FAFC), UINT64CONST(0x1E4D8D2B65FACC6F), + UINT64CONST(0xD95CAF179FC497DA), UINT64CONST(0x9BAC4EFC362EA149), + UINT64CONST(0x158E0A85C2521623), UINT64CONST(0x577EEB6E6BB820B0), + UINT64CONST(0x906FC95291867B05), UINT64CONST(0xD29F28B9386C4D96), + UINT64CONST(0xCEDBA04AD0952342), UINT64CONST(0x8C2B41A1797F15D1), + UINT64CONST(0x4B3A639D83414E64), UINT64CONST(0x09CA82762AAB78F7), + UINT64CONST(0x87E8C60FDED7CF9D), UINT64CONST(0xC51827E4773DF90E), + UINT64CONST(0x020905D88D03A2BB), UINT64CONST(0x40F9E43324E99428), + UINT64CONST(0x2CFFE7D5975E55E2), UINT64CONST(0x6E0F063E3EB46371), + UINT64CONST(0xA91E2402C48A38C4), UINT64CONST(0xEBEEC5E96D600E57), + UINT64CONST(0x65CC8190991CB93D), UINT64CONST(0x273C607B30F68FAE), + UINT64CONST(0xE02D4247CAC8D41B), UINT64CONST(0xA2DDA3AC6322E288), + UINT64CONST(0xBE992B5F8BDB8C5C), UINT64CONST(0xFC69CAB42231BACF), + UINT64CONST(0x3B78E888D80FE17A), UINT64CONST(0x7988096371E5D7E9), + UINT64CONST(0xF7AA4D1A85996083), UINT64CONST(0xB55AACF12C735610), + UINT64CONST(0x724B8ECDD64D0DA5), UINT64CONST(0x30BB6F267FA73B36), + UINT64CONST(0x4AC29F2A07BFD00D), UINT64CONST(0x08327EC1AE55E69E), + UINT64CONST(0xCF235CFD546BBD2B), UINT64CONST(0x8DD3BD16FD818BB8), + UINT64CONST(0x03F1F96F09FD3CD2), UINT64CONST(0x41011884A0170A41), + UINT64CONST(0x86103AB85A2951F4), UINT64CONST(0xC4E0DB53F3C36767), + UINT64CONST(0xD8A453A01B3A09B3), UINT64CONST(0x9A54B24BB2D03F20), + UINT64CONST(0x5D45907748EE6495), UINT64CONST(0x1FB5719CE1045206), + UINT64CONST(0x919735E51578E56C), UINT64CONST(0xD367D40EBC92D3FF), + UINT64CONST(0x1476F63246AC884A), UINT64CONST(0x568617D9EF46BED9), + UINT64CONST(0xE085162AB69D5E3C), UINT64CONST(0xA275F7C11F7768AF), + UINT64CONST(0x6564D5FDE549331A), UINT64CONST(0x279434164CA30589), + UINT64CONST(0xA9B6706FB8DFB2E3), UINT64CONST(0xEB46918411358470), + UINT64CONST(0x2C57B3B8EB0BDFC5), UINT64CONST(0x6EA7525342E1E956), + UINT64CONST(0x72E3DAA0AA188782), UINT64CONST(0x30133B4B03F2B111), + UINT64CONST(0xF7021977F9CCEAA4), UINT64CONST(0xB5F2F89C5026DC37), + UINT64CONST(0x3BD0BCE5A45A6B5D), UINT64CONST(0x79205D0E0DB05DCE), + UINT64CONST(0xBE317F32F78E067B), UINT64CONST(0xFCC19ED95E6430E8), + UINT64CONST(0x86B86ED5267CDBD3), UINT64CONST(0xC4488F3E8F96ED40), + UINT64CONST(0x0359AD0275A8B6F5), UINT64CONST(0x41A94CE9DC428066), + UINT64CONST(0xCF8B0890283E370C), UINT64CONST(0x8D7BE97B81D4019F), + UINT64CONST(0x4A6ACB477BEA5A2A), UINT64CONST(0x089A2AACD2006CB9), + UINT64CONST(0x14DEA25F3AF9026D), UINT64CONST(0x562E43B4931334FE), + UINT64CONST(0x913F6188692D6F4B), UINT64CONST(0xD3CF8063C0C759D8), + UINT64CONST(0x5DEDC41A34BBEEB2), UINT64CONST(0x1F1D25F19D51D821), + UINT64CONST(0xD80C07CD676F8394), UINT64CONST(0x9AFCE626CE85B507) }; #endif /* INT64_IS_BUSTED */ diff --git a/src/include/c.h b/src/include/c.h index 52637717f58..f01d2047463 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.116 2002/04/21 19:48:18 thomas Exp $ + * $Id: c.h,v 1.117 2002/04/23 15:45:30 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -302,6 +302,17 @@ typedef unsigned long int uint64; #endif /* not HAVE_LONG_INT_64 and not HAVE_LONG_LONG_INT_64 */ +/* Decide if we need to decorate 64-bit constants */ +#ifdef HAVE_LL_CONSTANTS +#define INT64CONST(x) ((int64) x##LL) +#define UINT64CONST(x) ((uint64) x##LL) +#else +#define INT64CONST(x) ((int64) x) +#define UINT64CONST(x) ((uint64) x) +#endif + + +/* Select timestamp representation (float8 or int64) */ #if defined(USE_INTEGER_DATETIMES) && !defined(INT64_IS_BUSTED) #define HAVE_INT64_TIMESTAMP #endif diff --git a/src/include/utils/date.h b/src/include/utils/date.h index 209dd74d9dc..9303952001d 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: date.h,v 1.18 2002/04/21 19:48:31 thomas Exp $ + * $Id: date.h,v 1.19 2002/04/23 15:45:30 tgl Exp $ * *------------------------------------------------------------------------- */ #ifndef DATE_H #define DATE_H -#include "c.h" #include "fmgr.h" diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index e2947e00508..ad3be8bc3ac 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: int8.h,v 1.32 2002/04/21 19:48:31 thomas Exp $ + * $Id: int8.h,v 1.33 2002/04/23 15:45:30 tgl Exp $ * * NOTES * These data types are supported on all 64-bit architectures, and may @@ -20,21 +20,15 @@ #ifndef INT8_H #define INT8_H -#include "c.h" #include "fmgr.h" + /* this should be set in pg_config.h, but just in case it wasn't: */ #ifndef INT64_FORMAT #warning "Broken pg_config.h should have defined INT64_FORMAT" #define INT64_FORMAT "%ld" #endif -#ifdef HAVE_LL_CONSTANTS -#define INT64CONST(x) ((int64) x##LL) -#else -#define INT64CONST(x) ((int64) x) -#endif - extern Datum int8in(PG_FUNCTION_ARGS); extern Datum int8out(PG_FUNCTION_ARGS); diff --git a/src/include/utils/pg_crc.h b/src/include/utils/pg_crc.h index 68c699cd748..b18baa4de34 100644 --- a/src/include/utils/pg_crc.h +++ b/src/include/utils/pg_crc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_crc.h,v 1.6 2001/11/05 17:46:36 momjian Exp $ + * $Id: pg_crc.h,v 1.7 2002/04/23 15:45:30 tgl Exp $ */ #ifndef PG_CRC_H #define PG_CRC_H @@ -78,23 +78,16 @@ extern const uint32 crc_table1[]; #else /* int64 works */ -/* decide if we need to decorate constants */ -#ifdef HAVE_LL_CONSTANTS -#define INT64CONST(x) x##LL -#else -#define INT64CONST(x) x -#endif - typedef struct crc64 { uint64 crc0; } crc64; /* Initialize a CRC accumulator */ -#define INIT_CRC64(crc) ((crc).crc0 = INT64CONST(0xffffffffffffffff)) +#define INIT_CRC64(crc) ((crc).crc0 = UINT64CONST(0xffffffffffffffff)) /* Finish a CRC calculation */ -#define FIN_CRC64(crc) ((crc).crc0 ^= INT64CONST(0xffffffffffffffff)) +#define FIN_CRC64(crc) ((crc).crc0 ^= UINT64CONST(0xffffffffffffffff)) /* Accumulate some (more) bytes into a CRC */ #define COMP_CRC64(crc, data, len) \ diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index a4da9dd5d6b..ca3e761a912 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: timestamp.h,v 1.25 2002/04/21 19:48:31 thomas Exp $ + * $Id: timestamp.h,v 1.26 2002/04/23 15:45:30 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,6 @@ #include #include -#include "c.h" #include "fmgr.h" #ifdef HAVE_INT64_TIMESTAMP #include "utils/int8.h" @@ -31,7 +30,7 @@ * relative to an absolute time. * * Note that Postgres uses "time interval" to mean a bounded interval, - * consisting of a beginning and ending time, not a time span - thomas 97/03/20 + * consisting of a beginning and ending time, not a time span - thomas 97/03/20 */ #ifdef HAVE_INT64_TIMESTAMP @@ -56,10 +55,12 @@ typedef struct /* * Macros for fmgr-callable functions. * - * For Timestamp, we make use of the same support routines as for float8. - * Therefore Timestamp is pass-by-reference if and only if float8 is! + * For Timestamp, we make use of the same support routines as for int64 + * or float8. Therefore Timestamp is pass-by-reference if and only if + * int64 or float8 is! */ #ifdef HAVE_INT64_TIMESTAMP + #define DatumGetTimestamp(X) ((Timestamp) DatumGetInt64(X)) #define DatumGetTimestampTz(X) ((TimestampTz) DatumGetInt64(X)) #define DatumGetIntervalP(X) ((Interval *) DatumGetPointer(X)) @@ -80,6 +81,7 @@ typedef struct #define DT_NOEND (INT64CONST(0x7fffffffffffffff)) #else + #define DatumGetTimestamp(X) ((Timestamp) DatumGetFloat8(X)) #define DatumGetTimestampTz(X) ((TimestampTz) DatumGetFloat8(X)) #define DatumGetIntervalP(X) ((Interval *) DatumGetPointer(X)) @@ -103,7 +105,9 @@ typedef struct #define DT_NOBEGIN (-DBL_MAX) #define DT_NOEND (DBL_MAX) #endif -#endif + +#endif /* HAVE_INT64_TIMESTAMP */ + #define TIMESTAMP_NOBEGIN(j) do {j = DT_NOBEGIN;} while (0) #define TIMESTAMP_IS_NOBEGIN(j) ((j) == DT_NOBEGIN) @@ -118,15 +122,16 @@ typedef struct #define MAX_INTERVAL_PRECISION 6 #ifdef HAVE_INT64_TIMESTAMP + typedef int32 fsec_t; -#define SECONDS_TO_TIMESTAMP(x) (INT64CONST(x000000)) #else + typedef double fsec_t; -#define SECONDS_TO_TIMESTAMP(x) (xe0) #define TIME_PREC_INV 1000000.0 #define JROUND(j) (rint(((double) (j))*TIME_PREC_INV)/TIME_PREC_INV) + #endif -- 2.39.5