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

Commit540c114

Browse files
committed
Redefine cpu's as __cpu__. Only for 6.6 branch.
1 parent0ab1c11 commit540c114

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

‎src/backend/port/dynloader/bsd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ BSD44_derived_dlerror(void)
6161
void*
6262
BSD44_derived_dlopen(constchar*file,intnum)
6363
{
64-
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(vax))
64+
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(__vax__))
6565
sprintf(error_message,"dlopen (%s) not supported",file);
6666
returnNULL;
6767
#else
@@ -76,7 +76,7 @@ BSD44_derived_dlopen(const char *file, int num)
7676
void*
7777
BSD44_derived_dlsym(void*handle,constchar*name)
7878
{
79-
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(vax))
79+
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(__vax__))
8080
sprintf(error_message,"dlsym (%s) failed",name);
8181
returnNULL;
8282
#elif defined(__ELF__)
@@ -99,7 +99,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
9999
void
100100
BSD44_derived_dlclose(void*handle)
101101
{
102-
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(vax))
102+
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(__vax__))
103103
#else
104104
dlclose(handle);
105105
#endif

‎src/backend/port/dynloader/freebsd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ BSD44_derived_dlerror(void)
6161
void*
6262
BSD44_derived_dlopen(constchar*file,intnum)
6363
{
64-
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(vax))
64+
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(__vax__))
6565
sprintf(error_message,"dlopen (%s) not supported",file);
6666
returnNULL;
6767
#else
@@ -76,7 +76,7 @@ BSD44_derived_dlopen(const char *file, int num)
7676
void*
7777
BSD44_derived_dlsym(void*handle,constchar*name)
7878
{
79-
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(vax))
79+
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(__vax__))
8080
sprintf(error_message,"dlsym (%s) failed",name);
8181
returnNULL;
8282
#else
@@ -99,7 +99,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
9999
void
100100
BSD44_derived_dlclose(void*handle)
101101
{
102-
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(vax))
102+
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(__vax__))
103103
#else
104104
dlclose(handle);
105105
#endif

‎src/include/c.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: c.h,v 1.58 1999/07/01 19:47:25 momjian Exp $
10+
* $Id: c.h,v 1.59 1999/07/13 20:00:32 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -759,7 +759,7 @@ extern char *vararg_format(const char *fmt,...);
759759
#endif/* hpux */
760760
#endif
761761

762-
#if defined(sun)&& defined(sparc)&& !defined(__SVR4)
762+
#if defined(sun)&& defined(__sparc__)&& !defined(__SVR4)
763763
#definememmove(d,s,l)bcopy(s, d, l)
764764
#include<unistd.h>
765765
#include<varargs.h>

‎src/include/port/bsd.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#defineUSE_POSIX_TIME
22

3-
#if defined(i386)
3+
#if defined(__i386__)
44
#defineNEED_I386_TAS_ASM
55
#defineHAS_TEST_AND_SET
66
#endif
77

8-
#if defined(sparc)
8+
#if defined(__sparc__)
99
#defineNEED_SPARC_TAS_ASM
1010
#defineHAS_TEST_AND_SET
1111
#endif
1212

13-
#if defined(vax)
13+
#if defined(__vax__)
1414
#defineNEED_VAX_TAS_ASM
1515
#defineHAS_TEST_AND_SET
1616
#endif

‎src/include/port/bsdi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#if defined(i386)
1+
#if defined(__i386__)
22
#defineNEED_I386_TAS_ASM
33
#endif
4-
#if defined(sparc)
4+
#if defined(__sparc__)
55
#defineNEED_SPARC_TAS_ASM
66
#endif
77
#defineUSE_POSIX_TIME

‎src/include/port/freebsd.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#defineUSE_POSIX_TIME
22

3-
#if defined(i386)
3+
#if defined(__i386__)
44
#defineNEED_I386_TAS_ASM
55
#defineHAS_TEST_AND_SET
66
#endif
77

8-
#if defined(sparc)
8+
#if defined(__sparc__)
99
#defineNEED_SPARC_TAS_ASM
1010
#defineHAS_TEST_AND_SET
1111
#endif
1212

13-
#if defined(vax)
13+
#if defined(__vax__)
1414
#defineNEED_VAX_TAS_ASM
1515
#defineHAS_TEST_AND_SET
1616
#endif

‎src/include/storage/s_lock.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.61 1999/06/13 00:07:43 ishii Exp $
10+
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.62 1999/07/1320:00:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -108,7 +108,7 @@ __asm__(" ldq $0, %0 \n\
108108

109109

110110

111-
#if defined(i386)
111+
#if defined(__i386__)
112112
#defineTAS(lock) tas(lock)
113113

114114
static __inline__int
@@ -120,7 +120,7 @@ __asm__("lock; xchgb %0,%1": "=q"(_res), "=m"(*lock):"0"(_res));
120120
return (int)_res;
121121
}
122122

123-
#endif/*i386 */
123+
#endif/*__i386__ */
124124

125125

126126

@@ -140,7 +140,7 @@ __asm__("swpb %0, %0, [%3]": "=r"(_res), "=m"(*lock):"0"(_res), "r" (lock));
140140

141141

142142

143-
#if defined(sparc)
143+
#if defined(__sparc__)
144144
#defineTAS(lock) tas(lock)
145145

146146
static __inline__int
@@ -154,7 +154,7 @@ tas(volatile slock_t *lock)
154154
return (int)_res;
155155
}
156156

157-
#endif/*sparc */
157+
#endif/*__sparc__ */
158158

159159

160160
#if defined(__mc68000__)&& defined(__linux__)

‎src/interfaces/libpq/libpq-int.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* Copyright (c) 1994, Regents of the University of California
1313
*
14-
* $Id: libpq-int.h,v 1.9 1999/05/25 22:43:49 momjian Exp $
14+
* $Id: libpq-int.h,v 1.10 1999/07/13 20:00:37 momjian Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -278,7 +278,7 @@ extern intpqWait(int forRead, int forWrite, PGconn *conn);
278278

279279
/* supply an implementation of strerror() macro if system doesn't have it */
280280
#ifndefstrerror
281-
#if defined(sun)&& defined(sparc)&& !defined(__SVR4)
281+
#if defined(sun)&& defined(__sparc__)&& !defined(__SVR4)
282282
externchar*sys_errlist[];
283283

284284
#definestrerror(A) (sys_errlist[(A)])

0 commit comments

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