diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-09 17:30:15 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-10 00:30:57 +0000 |
| commit | 2e76bb466a82110ca80d5d6d982842cf2f9cc964 (patch) | |
| tree | 25e32f1b8f1dc338d06aa090270827ceca8789ac /wsutil | |
| parent | 3944e5563365cdd51a3a6ca3d55cff88d3bd4a25 (diff) | |
Use pid_t on UN*X, and HANDLE on Windows, for the process ID.
This avoids type punning; at least with Xcode 7 beta on El Capitan beta,
that produces warnings that get turned into errors.
Change-Id: I57f47455b9630f359828c07c92a190b5cb33816f
Reviewed-on: https://code.wireshark.org/review/8862
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/Makefile.common | 1 | ||||
| -rw-r--r-- | wsutil/process.h | 43 |
2 files changed, 44 insertions, 0 deletions
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index f93f973546..60d843ab31 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -107,6 +107,7 @@ libwsutil_nonrepl_INCLUDES = \ os_version_info.h \ plugins.h \ privileges.h \ + process.h \ sha1.h \ sign_ext.h \ sober128.h \ diff --git a/wsutil/process.h b/wsutil/process.h new file mode 100644 index 0000000000..eb3fd4c597 --- /dev/null +++ b/wsutil/process.h @@ -0,0 +1,43 @@ +/* process.h + * Process utility definitions + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef _WSUTIL_PROCESS_H_ +#define _WSUTIL_PROCESS_H_ + +#include "ws_symbol_export.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#ifdef _WIN32 +typedef HANDLE ws_process_id; /* on Windows, a process ID is a HANDLE */ +#else +typedef pid_t ws_process_id; /* on UN\*X, a process ID is a pid_t */ +#endif + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* _WSUTIL_PROCESS_H_ */ + |