comparison: libpurple/util.c
libpurple/util.c
- changeset 15744
- 5d75cdf1698e
- parent 15742
- 5ab2621654d4
- child 15845
- a20c5403f23e
equal
deleted
inserted
replaced
| 15742:5ab2621654d4 | 15744:5d75cdf1698e |
|---|---|
| 4142 signal(SIGALRM, SIG_DFL); /* 14: real-time timer expired */ | 4142 signal(SIGALRM, SIG_DFL); /* 14: real-time timer expired */ |
| 4143 signal(SIGTERM, SIG_DFL); /* 15: software termination signal */ | 4143 signal(SIGTERM, SIG_DFL); /* 15: software termination signal */ |
| 4144 signal(SIGCHLD, SIG_DFL); /* 20: child status has changed */ | 4144 signal(SIGCHLD, SIG_DFL); /* 20: child status has changed */ |
| 4145 signal(SIGXCPU, SIG_DFL); /* 24: exceeded CPU time limit */ | 4145 signal(SIGXCPU, SIG_DFL); /* 24: exceeded CPU time limit */ |
| 4146 signal(SIGXFSZ, SIG_DFL); /* 25: exceeded file size limit */ | 4146 signal(SIGXFSZ, SIG_DFL); /* 25: exceeded file size limit */ |
| 4147 <<<<<<< variant A | |
| 4148 #endif /* HAVE_SIGNAL_H */ | 4147 #endif /* HAVE_SIGNAL_H */ |
| 4149 #endif /* !_WIN32 */ | 4148 #endif /* !_WIN32 */ |
| 4150 >>>>>>> variant B | 4149 } |
| 4151 #endif /* HAVE_SIGNAL_H */ | |
| 4152 ####### Ancestor | |
| 4153 #endif | |
| 4154 ======= end | |
| 4155 } |
