BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't set _POSIX_C_SOURCE for VXI/RPC related files. 

Make vxi.h the first #include in all affected files and #undef the
_POSIX_C_SOURCE macro in vxi.h.

This avoids various build issues on e.g. FreeBSD or Mac OS X where
setting _POSIX_C_SOURCE leads to the unavailability of certain types
such as u_long (as used in the VXI/RPC code).
This commit is contained in:
Uwe Hermann 2015-08-29 14:50:44 +02:00
parent c05a0ba528
commit d40b8557a9
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scpi/scpi_vxi.c
View File

@ -20,9 +20,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "vxi.h"
#include <rpc/rpc.h> #include <rpc/rpc.h>
#include <string.h> #include <string.h>
#include "vxi.h"
#include <libsigrok/libsigrok.h> #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "scpi.h" #include "scpi.h"

2
src/scpi/vxi.h
View File

@ -3,6 +3,8 @@
* It was generated using rpcgen. * It was generated using rpcgen.
*/ */
#undef _POSIX_C_SOURCE
#ifndef _VXI_H_RPCGEN #ifndef _VXI_H_RPCGEN
#define _VXI_H_RPCGEN #define _VXI_H_RPCGEN

2
src/scpi/vxi_clnt.c
View File

@ -3,8 +3,8 @@
* It was generated using rpcgen. * It was generated using rpcgen.
*/ */
#include <memory.h> /* for memset */
#include "vxi.h" #include "vxi.h"
#include <memory.h> /* for memset */
/* Default timeout can be changed using clnt_control() */ /* Default timeout can be changed using clnt_control() */
static struct timeval TIMEOUT = { 25, 0 }; static struct timeval TIMEOUT = { 25, 0 };