Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2a7da3f

Browse files
committed
Standardize on __CYGWIN__ rather than __CYGWIN32__ macro. Doesn't matter
either way (although the former is preferred by the Cygwin folksthemselves), but using only one seems nicer.
1 parent30826ce commit2a7da3f

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎contrib/pgbench/pgbench.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.5 2000/07/12 22:58:57 petere Exp $
2+
* $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.6 2000/09/29 13:53:29 petere Exp $
33
*
44
* pgbench: a simple TPC-B like benchmark program for PostgreSQL
55
* written by Tatsuo Ishii
@@ -536,7 +536,7 @@ main(int argc, char **argv)
536536
intnsocks;/* return from select(2) */
537537
intmaxsock;/* max socket number to be waited */
538538

539-
#ifndef__CYGWIN32__
539+
#ifndef__CYGWIN__
540540
structrlimitrlim;
541541

542542
#endif
@@ -576,7 +576,7 @@ main(int argc, char **argv)
576576
fprintf(stderr,"wrong number of clients: %d\n",nclients);
577577
exit(1);
578578
}
579-
#ifndef__CYGWIN32__
579+
#ifndef__CYGWIN__
580580
#ifdefRLIMIT_NOFILE/* most platform uses RLIMIT_NOFILE */
581581
if (getrlimit(RLIMIT_NOFILE,&rlim)==-1)
582582
{
@@ -593,7 +593,7 @@ main(int argc, char **argv)
593593
fprintf(stderr,"Use limit/ulimt to increase the limit before using pgbench.\n");
594594
exit(1);
595595
}
596-
#endif/* #ifndef__CYGWIN32__ */
596+
#endif/* #ifndef__CYGWIN__ */
597597
break;
598598
case's':
599599
tps=atoi(optarg);

‎src/backend/utils/adt/nabstime.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.73 2000/07/28 02:13:31tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.74 2000/09/2913:53:31petere Exp $
1313
*
1414
* NOTES
1515
*
@@ -166,7 +166,7 @@ GetCurrentAbsoluteTime(void)
166166

167167
CDayLight=tm->tm_isdst;
168168
CTimeZone=
169-
#ifdef__CYGWIN32__
169+
#ifdef__CYGWIN__
170170
(tm->tm_isdst ? (_timezone-3600) :_timezone);
171171
#else
172172
(tm->tm_isdst ? (timezone-3600) :timezone);

‎src/include/c.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
99
* Portions Copyright (c) 1994, Regents of the University of California
1010
*
11-
* $Id: c.h,v 1.81 2000/08/21 17:22:32tgl Exp $
11+
* $Id: c.h,v 1.82 2000/09/29 13:53:32petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -52,7 +52,7 @@
5252
#include<stddef.h>
5353
#include<stdarg.h>
5454

55-
#ifdef__CYGWIN32__
55+
#ifdef__CYGWIN__
5656
#include<errno.h>
5757
#include<sys/fcntl.h>/* ensure O_BINARY is available */
5858
#endif
@@ -921,7 +921,7 @@ extern char *vararg_format(const char *fmt,...);
921921
* ----------------------------------------------------------------
922922
*/
923923

924-
#ifdef__CYGWIN32__
924+
#ifdef__CYGWIN__
925925
#definePG_BINARYO_BINARY
926926
#definePG_BINARY_R"rb"
927927
#definePG_BINARY_W"wb"
@@ -942,7 +942,7 @@ extern char *vararg_format(const char *fmt,...);
942942
#defineSEP_CHAR'/'
943943

944944
/* defines for dynamic linking on Win32 platform */
945-
#ifdef__CYGWIN32__
945+
#ifdef__CYGWIN__
946946
#if__GNUC__&& ! defined (__declspec)
947947
#error You need egcs 1.1 or newer for compiling!
948948
#endif

‎src/include/config.h.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* or in config.h afterwards. Of course, if you edit config.h, then your
99
* changes will be overwritten the next time you run configure.
1010
*
11-
* $Id: config.h.in,v 1.135 2000/09/27 15:17:55 petere Exp $
11+
* $Id: config.h.in,v 1.136 2000/09/29 13:53:32 petere Exp $
1212
*/
1313

1414
#ifndefCONFIG_H
@@ -227,7 +227,7 @@
227227
* Define this is your operating system kernel supports AF_UNIX family
228228
* sockets.
229229
*/
230-
#if !defined(__CYGWIN32__)&& !defined(__QNX__)
230+
#if !defined(__CYGWIN__)&& !defined(__QNX__)
231231
# defineHAVE_UNIX_SOCKETS 1
232232
#endif
233233

‎src/tools/entab/entab.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ char **argv;
9494
in_file=stdin;
9595
else
9696
{
97-
#ifndef__CYGWIN32__
97+
#ifndef__CYGWIN__
9898
if ((in_file=fopen(*argv,"r"))==NULL)
9999
#else
100100
if ((in_file=fopen(*argv,"rb"))==NULL)

‎src/utils/dllinit.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@
4343
BOOLAPIENTRYDllMain(HINSTANCEhInst,DWORDreason,
4444
LPVOIDreserved/* Not used. */ );
4545

46-
#ifdef__CYGWIN32__
46+
#ifdef__CYGWIN__
4747

4848
#include<cygwin/cygwin_dll.h>
4949
DECLARE_CYGWIN_DLL(DllMain);
5050
/* save hInstance from DllMain */
5151
HINSTANCE__hDllInstance_base;
5252

53-
#endif/*__CYGWIN32__ */
53+
#endif/*__CYGWIN__ */
5454

5555
struct_reent*_impure_ptr;
5656

@@ -80,9 +80,9 @@ DllMain(
8080
LPVOIDreserved/* Not used. */ )
8181
{
8282

83-
#ifdef__CYGWIN32__
83+
#ifdef__CYGWIN__
8484
__hDllInstance_base=hInst;
85-
#endif/*__CYGWIN32__ */
85+
#endif/*__CYGWIN__ */
8686

8787
_impure_ptr=__imp_reent_data;
8888

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp