diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-26 13:08:39 +0200 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-26 13:08:39 +0200 |
| commit | f526c4c7a7ada1ab534ca0976c7b66718b9a5660 (patch) | |
| tree | 68b4db309ee00d3b7ebc1743b4825057b3db7f28 /phpcpp.h | |
| parent | a286c34777e48d59410e7511f52f4a6f08000ba3 (diff) | |
| parent | 97bc6757346d394a4b7d5898983be298e0b0ea98 (diff) | |
fixed conflict
Diffstat (limited to 'phpcpp.h')
| -rw-r--r-- | phpcpp.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2,7 +2,7 @@ * phpcpp.h * * Library to build PHP extensions with CPP - * + * * @copyright 2013 CopernicA BV * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> */ @@ -29,6 +29,7 @@ #include <phpcpp/inivalue.h> #include <phpcpp/ini.h> #include <phpcpp/exception.h> +#include <phpcpp/fatalerror.h> #include <phpcpp/streams.h> #include <phpcpp/type.h> #include <phpcpp/hashparent.h> |