diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2016-06-12 16:31:57 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-13 21:17:29 +0000 |
| commit | 858dc0c5f037d75001027d590746dc03ae19b930 (patch) | |
| tree | ba279fd0de3b0460433d051a77bbe309554e5a38 | |
| parent | dda2acc06fa42f7251c9e60a01aab970488116fb (diff) | |
| download | wireshark-858dc0c5f037d75001027d590746dc03ae19b930.tar.gz | |
use #include <file.h> for generated include files
the same mechanism as described in
7c40de5c38ac71323455c51dcc14a5eb385ce718
could trick us into using the wrong config.h
fix this for some occassions where config.h is included before we
include zlib.h
I saw compile errors on windows where we picked up config.h from a linux
build and zlib failed because of a mission unistd.h
Change-Id: I91cf73b96c9e1b6f009fb2376fabfe973d1ac941
Reviewed-on: https://code.wireshark.org/review/15874
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/tvbuff_zlib.c | 2 | ||||
| -rw-r--r-- | filter_files.c | 2 | ||||
| -rw-r--r-- | ws_version_info.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/epan/tvbuff_zlib.c b/epan/tvbuff_zlib.c index 3f23f57d58..e5cb40a6a0 100644 --- a/epan/tvbuff_zlib.c +++ b/epan/tvbuff_zlib.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/filter_files.c b/filter_files.c index 99a71f54ec..739712f38b 100644 --- a/filter_files.c +++ b/filter_files.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <string.h> diff --git a/ws_version_info.c b/ws_version_info.c index 944a5798a0..f1c5ee02f9 100644 --- a/ws_version_info.c +++ b/ws_version_info.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> |