*** pgsql/src/tools/msvc/Solution.pm	2008/12/16 15:42:21	1.46
--- pgsql/src/tools/msvc/Solution.pm	2009/01/06 18:37:50	1.47
*************** package Solution;
*** 3,9 ****
  #
  # Package that encapsulates a Visual C++ solution file generation
  #
! # $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.45 2008/11/14 17:11:40 meskes Exp $
  #
  use Carp;
  use strict;
--- 3,9 ----
  #
  # Package that encapsulates a Visual C++ solution file generation
  #
! # $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.46 2008/12/16 15:42:21 adunstan Exp $
  #
  use Carp;
  use strict;
*************** sub GenerateFiles
*** 122,128 ****
          {
              s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}"};
              s{PG_VERSION_NUM \d+}{PG_VERSION_NUM $self->{numver}};
! s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY(z)\n#define PG_VERSION_STR "PostgreSQL $self->{strver}, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER)};
              print O;
          }
  		print O "#define PG_MAJORVERSION \"$self->{majorver}\"\n";
--- 122,129 ----
          {
              s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}"};
              s{PG_VERSION_NUM \d+}{PG_VERSION_NUM $self->{numver}};
!             # XXX: When we support 64-bit, need to remove this hardcoding
! s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY(z)\n#define PG_VERSION_STR "PostgreSQL $self->{strver}, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER) ", 32-bit"};
              print O;
          }
  		print O "#define PG_MAJORVERSION \"$self->{majorver}\"\n";