diff options
Diffstat (limited to 'src/libstrongswan/processing/processor.c')
| -rw-r--r-- | src/libstrongswan/processing/processor.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstrongswan/processing/processor.c b/src/libstrongswan/processing/processor.c index 723aec908..6c0d9aa84 100644 --- a/src/libstrongswan/processing/processor.c +++ b/src/libstrongswan/processing/processor.c @@ -248,7 +248,11 @@ static void destroy(private_processor_t *this) /* * Described in header. */ +<<<<<<< HEAD +processor_t *processor_create(size_t pool_size) +======= processor_t *processor_create() +>>>>>>> upstream/4.5.1 { private_processor_t *this = malloc_thing(private_processor_t); |