*** pgsql/src/timezone/pgtz.c	2008/07/01 03:41:10	1.48.2.2
--- pgsql/src/timezone/pgtz.c	2010/04/06 20:35:13	1.48.2.3
***************
*** 6,12 ****
   * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.48.2.1 2008/02/11 19:55:13 mha Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 6,12 ----
   * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.48.2.2 2008/07/01 03:41:10 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** identify_system_timezone(void)
*** 1073,1079 ****
  		if ((r = RegQueryValueEx(key, "Std", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
  		{
  			ereport(WARNING,
! 					(errmsg_internal("could not query value for 'std' to identify Windows timezone: %i", (int) r)));
  			RegCloseKey(key);
  			break;
  		}
--- 1073,1080 ----
  		if ((r = RegQueryValueEx(key, "Std", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
  		{
  			ereport(WARNING,
! 					(errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i",
! 									 keyname, (int) r)));
  			RegCloseKey(key);
  			break;
  		}
*************** identify_system_timezone(void)
*** 1089,1095 ****
  		if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
  		{
  			ereport(WARNING,
! 					(errmsg_internal("could not query value for 'dlt' to identify Windows timezone: %i", (int) r)));
  			RegCloseKey(key);
  			break;
  		}
--- 1090,1097 ----
  		if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
  		{
  			ereport(WARNING,
! 					(errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i",
! 									 keyname, (int) r)));
  			RegCloseKey(key);
  			break;
  		}