Mercurial > pidgin
changeset 15682:f344b5cc2fc9
merge of 'dbd6240bc36085014ed8c0efd9549c1213bd4785'
and 'fef1af8e40707d8feb138874ec7675ae23a50f90'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 23 Feb 2007 05:16:50 +0000 |
| parents | cad32dba756b (current diff) fc981ec147a6 (diff) |
| children | 58392653a1bd 95d67f46bb93 70e4796455ba |
| files | libpurple/util.c |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/util.c Thu Feb 22 23:32:39 2007 +0000 +++ b/libpurple/util.c Fri Feb 23 05:16:50 2007 +0000 @@ -4144,6 +4144,12 @@ signal(SIGCHLD, SIG_DFL); /* 20: child status has changed */ signal(SIGXCPU, SIG_DFL); /* 24: exceeded CPU time limit */ signal(SIGXFSZ, SIG_DFL); /* 25: exceeded file size limit */ +<<<<<<< variant A #endif /* HAVE_SIGNAL_H */ #endif /* !_WIN32 */ +>>>>>>> variant B +#endif /* HAVE_SIGNAL_H */ +####### Ancestor +#endif +======= end }