| author | Danek Duvall <danek.duvall@oracle.com> |
| Thu, 09 Apr 2015 22:09:36 -0700 | |
| branch | s11-update |
| changeset 4182 | edb1ea7d72bc |
| permissions | -rw-r--r-- |
|
4182
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
Pulled from http://ftp.vim.org/pub/vim/patches/7.4/7.4.692 |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
Removed the version.c bump. |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
|
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
To: [email protected] |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
Subject: Patch 7.4.692 |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
Fcc: outbox |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
From: Bram Moolenaar <[email protected]> |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
Mime-Version: 1.0 |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
Content-Type: text/plain; charset=UTF-8 |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
Content-Transfer-Encoding: 8bit |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
------------ |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
|
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
Patch 7.4.692 |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
Problem: Defining SOLARIS for no good reason. (Danek Duvall) |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
Solution: Remove it. |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
Files: src/os_unix.h |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
|
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
|
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
*** ../vim-7.4.691/src/os_unix.h 2014-03-25 13:46:22.841832960 +0100 |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
20 |
--- src/os_unix.h 2015-04-09 22:04:39.557343160 +0200 |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
21 |
*************** |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
22 |
*** 65,77 **** |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
23 |
#endif |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
|
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
/* |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
- * Sun defines FILE on SunOS 4.x.x, Solaris has a typedef for FILE |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
- */ |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
28 |
- #if defined(sun) && !defined(FILE) |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
- # define SOLARIS |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
- #endif |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
31 |
- |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
32 |
- /* |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
33 |
* Using getcwd() is preferred, because it checks for a buffer overflow. |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
34 |
* Don't use getcwd() on systems do use system("sh -c pwd"). There is an
|
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
35 |
* autoconf check for this. |
|
edb1ea7d72bc
20854707 vim build error in python module due to gethostname() redeclaration
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
36 |
--- 65,70 ---- |