diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-03-12 12:17:28 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-03-12 12:17:28 +0000 |
| commit | 02f07e0c23bfbadd1952c874d98be057bf194394 (patch) | |
| tree | 3d5fa53f8ba90af42394ee42d9d87cd58aa05af3 | |
| parent | 91d8e0c1944c9460511ff488877a96e942a29f3b (diff) | |
updated for version 7.1-273v7.1.273
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/os_unix.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 4ef0a0f56c..ae8878c1ec 100644 --- a/src/Makefile +++ b/src/Makefile @@ -545,7 +545,7 @@ LINT_OPTIONS = -beprxzF # For unknown reasons adding "-lc" fixes a linking problem with GCC. That's # probably a bug in the "-pg" implementation. # Need to recompile everything after changing this: "make clean" "make". -#PROFILE_CFLAGS = -pg -g +#PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING #PROFILE_LIBS = -pg #PROFILE_LIBS = -pg -lc diff --git a/src/os_unix.c b/src/os_unix.c index 07b1f8b0ad..1b0ec703ee 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -269,8 +269,9 @@ static struct signalinfo #ifdef SIGVTALRM {SIGVTALRM, "VTALRM", TRUE}, #endif -#if defined(SIGPROF) && !defined(FEAT_MZSCHEME) - /* MzScheme uses SIGPROF for its own needs */ +#if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING) + /* MzScheme uses SIGPROF for its own needs; On Linux with profiling + * this makes Vim exit. WE_ARE_PROFILING is defined in Makefile. */ {SIGPROF, "PROF", TRUE}, #endif #ifdef SIGXCPU diff --git a/src/version.c b/src/version.c index 934af0d29f..193e8a9909 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 273, +/**/ 272, /**/ 271, |