Skip to content

Commit 877b61e

Browse files
peterepetere
committed
Cosmetic cleaning of pg_config.h.win32
Clean up some comments (some generated by old versions of autoconf) and some random ordering differences, so it's easier to diff this against the default pg_config.h or pg_config.h.in. Remove LOCALEDIR handling from pg_config.h.win32 altogether because it's already in pg_config_paths.h.
1 parent 6cafde1 commit 877b61e

File tree

2 files changed

+44
-49
lines changed

2 files changed

+44
-49
lines changed

‎src/include/pg_config.h.win32

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222
/* Define to the return type of 'accept' */
2323
#define ACCEPT_TYPE_RETURN unsigned int PASCAL
2424

25-
/* The alignment requirement of a `double'. */
25+
/* The normal alignment of `double', in bytes. */
2626
#define ALIGNOF_DOUBLE 8
2727

28-
/* The alignment requirement of a `int'. */
28+
/* The normal alignment of `int', in bytes. */
2929
#define ALIGNOF_INT 4
3030

31-
/* The alignment requirement of a `long'. */
31+
/* The normal alignment of `long', in bytes. */
3232
#define ALIGNOF_LONG 4
3333

34-
/* The alignment requirement of a `long long int'. */
34+
/* The normal alignment of `long long int', in bytes. */
3535
#define ALIGNOF_LONG_LONG_INT 8
3636

3737
/* The normal alignment of `PG_INT128_TYPE', in bytes. */
3838
#undef ALIGNOF_PG_INT128_TYPE
3939

40-
/* The alignment requirement of a `short'. */
40+
/* The normal alignment of `short', in bytes. */
4141
#define ALIGNOF_SHORT 2
4242

4343
/* Define to the default TCP port number on which the server listens and to
@@ -49,6 +49,13 @@
4949
/* Define to the default TCP port number as a string constant. */
5050
#define DEF_PGPORT_STR "5432"
5151

52+
/* Define to 1 if you want National Language Support. (--enable-nls) */
53+
/* #undef ENABLE_NLS */
54+
55+
/* Define to 1 to build client libraries as thread-safe code.
56+
(--enable-thread-safety) */
57+
#define ENABLE_THREAD_SAFETY 1
58+
5259
/* Define to nothing if C supports flexible array members, and to 1 if it does
5360
not. That way, with a declaration like `struct s { int n; double
5461
d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
@@ -58,13 +65,6 @@
5865
MSVC and with C++ compilers. */
5966
#define FLEXIBLE_ARRAY_MEMBER
6067

61-
/* Define to 1 if you want National Language Support. (--enable-nls) */
62-
/* #undef ENABLE_NLS */
63-
64-
/* Define to 1 to build client libraries as thread-safe code.
65-
(--enable-thread-safety) */
66-
#define ENABLE_THREAD_SAFETY 1
67-
6868
/* Define to 1 if gettimeofday() takes only 1 argument. */
6969
/* #undef GETTIMEOFDAY_1ARG */
7070

@@ -75,6 +75,9 @@
7575
/* Define to 1 if you have the `ASN1_STRING_get0_data' function. */
7676
/* #undef HAVE_ASN1_STRING_GET0_DATA */
7777

78+
/* Define to 1 if you want to use atomics if available. */
79+
#define HAVE_ATOMICS 1
80+
7881
/* Define to 1 if you have the `BIO_get_data' function. */
7982
/* #undef HAVE_BIO_GET_DATA */
8083

@@ -109,14 +112,14 @@
109112
`LLVMCreatePerfJITEventListener', and to 0 if you don't. */
110113
#undef HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER
111114

115+
/* Define to 1 if you have the declaration of `LLVMGetHostCPUFeatures', and to
116+
0 if you don't. */
117+
#define HAVE_DECL_LLVMGETHOSTCPUFEATURES 0
118+
112119
/* Define to 1 if you have the declaration of `LLVMGetHostCPUName', and to 0
113120
if you don't. */
114121
#define HAVE_DECL_LLVMGETHOSTCPUNAME 0
115122

116-
/* Define to 1 if you have the declaration of `LLVMGetHostCPUFeatures', and to 0
117-
if you don't. */
118-
#define HAVE_DECL_LLVMGETHOSTCPUFEATURES 0
119-
120123
/* Define to 1 if you have the declaration of `LLVMOrcGetSymbolAddressIn', and
121124
to 0 if you don't. */
122125
#define HAVE_DECL_LLVMORCGETSYMBOLADDRESSIN 0
@@ -133,9 +136,6 @@
133136
don't. */
134137
#define HAVE_DECL_STRNLEN 1
135138

136-
/* Define to 1 if you have the `strtof' function. */
137-
#define HAVE_STRTOF 1
138-
139139
/* Define to 1 if you have the declaration of `strtoll', and to 0 if you
140140
don't. */
141141
#define HAVE_DECL_STRTOLL 1
@@ -180,7 +180,7 @@
180180
/* Define to 1 if your compiler understands __FUNCTION__. */
181181
#define HAVE_FUNCNAME__FUNCTION 1
182182

183-
/* Define to 1 if you have getaddrinfo(). */
183+
/* Define to 1 if you have the `getaddrinfo' function. */
184184
/* #undef HAVE_GETADDRINFO */
185185

186186
/* Define to 1 if you have the `gethostbyname_r' function. */
@@ -297,9 +297,6 @@
297297
/* Define to 1 if you have the <pam/pam_appl.h> header file. */
298298
/* #undef HAVE_PAM_PAM_APPL_H */
299299

300-
/* Define to 1 if you have the `strnlen' function. */
301-
#define HAVE_STRNLEN 1
302-
303300
/* Define to 1 if you have the `poll' function. */
304301
/* #undef HAVE_POLL */
305302

@@ -364,9 +361,6 @@
364361
/* Define to 1 if you have spinlocks. */
365362
#define HAVE_SPINLOCKS 1
366363

367-
/* Define to 1 if you have atomics. */
368-
#define HAVE_ATOMICS 1
369-
370364
/* Define to 1 if you have the `srandom' function. */
371365
/* #undef HAVE_SRANDOM */
372366

@@ -391,9 +385,15 @@
391385
/* Define to 1 if you have the <string.h> header file. */
392386
#define HAVE_STRING_H 1
393387

388+
/* Define to 1 if you have the `strnlen' function. */
389+
#define HAVE_STRNLEN 1
390+
394391
/* Define to 1 if you have the `strsignal' function. */
395392
/* #undef HAVE_STRSIGNAL */
396393

394+
/* Define to 1 if you have the `strtof' function. */
395+
#define HAVE_STRTOF 1
396+
397397
/* Define to 1 if you have the `strtoll' function. */
398398
#ifdef HAVE_LONG_LONG_INT_64
399399
#define HAVE_STRTOLL 1
@@ -413,25 +413,25 @@
413413
/* Define to 1 if the system has the type `struct option'. */
414414
//#define HAVE_STRUCT_OPTION 1
415415

416-
/* Define to 1 if `sa_len' is member of `struct sockaddr'. */
416+
/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
417417
/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */
418418

419419
/* Define to 1 if the system has the type `struct sockaddr_storage'. */
420420
#define HAVE_STRUCT_SOCKADDR_STORAGE 1
421421

422-
/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */
422+
/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
423423
#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
424424

425-
/* Define to 1 if `ss_len' is member of `struct sockaddr_storage'. */
425+
/* Define to 1 if `ss_len' is a member of `struct sockaddr_storage'. */
426426
/* #undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN */
427427

428-
/* Define to 1 if `__ss_family' is member of `struct sockaddr_storage'. */
428+
/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
429429
/* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */
430430

431-
/* Define to 1 if `__ss_len' is member of `struct sockaddr_storage'. */
431+
/* Define to 1 if `__ss_len' is a member of `struct sockaddr_storage'. */
432432
/* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN */
433433

434-
/* Define to 1 if `tm_zone' is member of `struct tm'. */
434+
/* Define to 1 if `tm_zone' is a member of `struct tm'. */
435435
/* #undef HAVE_STRUCT_TM_TM_ZONE */
436436

437437
/* Define to 1 if you have the `symlink' function. */
@@ -578,9 +578,6 @@
578578
/* Define to 1 if `locale_t' requires <xlocale.h>. */
579579
/* #undef LOCALE_T_IN_XLOCALE */
580580

581-
/* Define to the location of locale files. */
582-
/* #undef LOCALEDIR */
583-
584581
/* Define as the maximum alignment requirement of any C data type. */
585582
#define MAXIMUM_ALIGNOF 8
586583

@@ -596,6 +593,9 @@
596593
/* Define to the full name and version of this package. */
597594
#define PACKAGE_STRING "PostgreSQL 13devel"
598595

596+
/* Define to the one symbol short name of this package. */
597+
#define PACKAGE_TARNAME "postgresql"
598+
599599
/* Define to the version of this package. */
600600
#define PACKAGE_VERSION "13devel"
601601

@@ -605,22 +605,19 @@
605605
/* Define to the name of a signed 64-bit integer type. */
606606
#define PG_INT64_TYPE long long int
607607

608+
/* Define to the name of the default PostgreSQL service principal in Kerberos
609+
(GSSAPI). (--with-krb-srvnam=NAME) */
610+
#define PG_KRB_SRVNAM "postgres"
611+
612+
/* Define to 1 to use <stdbool.h> to define type bool. */
613+
#define PG_USE_STDBOOL 1
614+
608615
/* PostgreSQL version as a string */
609616
#define PG_VERSION "13devel"
610617

611618
/* PostgreSQL version as a number */
612619
#define PG_VERSION_NUM 130000
613620

614-
/* Define to the one symbol short name of this package. */
615-
#define PACKAGE_TARNAME "postgresql"
616-
617-
/* Define to the name of the default PostgreSQL service principal in Kerberos.
618-
(--with-krb-srvnam=NAME) */
619-
#define PG_KRB_SRVNAM "postgres"
620-
621-
/* Define to 1 to use <stdbool.h> to define type bool. */
622-
#define PG_USE_STDBOOL 1
623-
624621
/* A string containing the version number, platform, and C compiler */
625622
#define PG_VERSION_STR "Uninitialized version string (win32)"
626623

@@ -722,8 +719,8 @@
722719
#define inline __inline
723720
#endif
724721

725-
/* Define to keyword to use for C99 restrict support, or to nothing if this is
726-
not supported */
722+
/* Define to keyword to use for C99 restrict support, or to nothing if not
723+
supported */
727724
/* Works for C and C++ in Visual Studio 2008 and upwards */
728725
#define pg_restrict __restrict
729726

‎src/tools/msvc/Solution.pm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ sub GenerateFiles
184184
print $o $_;
185185
}
186186
print $o "#define PG_MAJORVERSION \"$self->{majorver}\"\n";
187-
print $o "#define LOCALEDIR \"/share/locale\"\n"
188-
if ($self->{options}->{nls});
189187
print $o "/* defines added by config steps */\n";
190188
print $o "#ifndef IGNORE_CONFIGURED_SETTINGS\n";
191189
print $o "#define USE_ASSERT_CHECKING 1\n"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy