3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:sustrik/zeromq2

Browse Source
This commit is contained in:
Martin Sustrik 2010-04-15 07:32:49 +02:00
commit 1c33941be9
9 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/msvc/c_local_lat/c_local_lat.vcproj
View File

@ -166,7 +166,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\..\perf\local_lat.c"
RelativePath="..\..\..\perf\local_lat.cpp"
>
</File>
</Filter>

2
builds/msvc/c_local_thr/c_local_thr.vcproj
View File

@ -166,7 +166,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\..\perf\local_thr.c"
RelativePath="..\..\..\perf\local_thr.cpp"
>
</File>
</Filter>

2
builds/msvc/c_remote_lat/c_remote_lat.vcproj
View File

@ -166,7 +166,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\..\perf\remote_lat.c"
RelativePath="..\..\..\perf\remote_lat.cpp"
>
</File>
</Filter>

2
builds/msvc/c_remote_thr/c_remote_thr.vcproj
View File

@ -166,7 +166,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\..\perf\remote_thr.c"
RelativePath="..\..\..\perf\remote_thr.cpp"
>
</File>
</Filter>

4
builds/msvc/libzmq/libzmq.vcproj
View File

@ -40,7 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="-DZMQ_BUILDING_LIBZMQ_WITH_MSVC"
AdditionalOptions="-DDLL_EXPORT"
Optimization="0"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -112,7 +112,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="-DZMQ_BUILDING_LIBZMQ_WITH_MSVC"
AdditionalOptions="-DDLL_EXPORT"
Optimization="2"
EnableIntrinsicFunctions="true"
RuntimeLibrary="2"

27
configure.in
View File

@ -260,8 +260,15 @@ AC_CHECK_HEADERS(ifaddrs.h, [AC_DEFINE(ZMQ_HAVE_IFADDRS, 1, [Have ifaddrs.h head
# Use c++ in subsequent tests
AC_LANG(C++)
# Optional stuff
AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
# pkg-config is used if found, and is required for builds with OpenPGM.
# However, we need to provide a way to disable it entirely when the user
# knows what she's doing and it's use is undesirable, such as when
# cross-compiling.
AC_ARG_WITH([pkg-config], [AS_HELP_STRING([--without-pkg-config],
[do not use pkg-config [default=no]])])
if test "x$with_pkg_config" != "xno"; then
AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
fi
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL
@ -328,15 +335,17 @@ if test "x$with_pgm_ext" != "xno"; then
AC_MSG_RESULT([yes])
# Test if we have pkg-config
if test "x$have_pkg_config" != "xyes"; then
AC_MSG_ERROR([the --with-pgm option requires that pkg-config be installed.]);
if test "x$with_pkg_config" != "xno"; then
if test "x$have_pkg_config" != "xyes"; then
AC_MSG_ERROR([the --with-pgm option requires that pkg-config be installed.]);
fi
# Check for OpenPGM dependencies
PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0])
LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} ${GLIB_CFLAGS} "
LIBZMQ_EXTRA_LDFLAGS="${LIBZMQ_EXTRA_LDFLAGS} ${GLIB_LIBS} "
fi
# Check for OpenPGM dependencies
PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0])
LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} ${GLIB_CFLAGS} "
LIBZMQ_EXTRA_LDFLAGS="${LIBZMQ_EXTRA_LDFLAGS} ${GLIB_LIBS} "
# Gzip, Perl and Python are required duing PGM build
AC_CHECK_PROG(have_gzip, gzip, yes, no)
if test "x$have_gzip" != "xyes"; then

2
foreign/xmlParser/xmlParser.cpp
View File

@ -94,7 +94,7 @@
//#include <crtdbg.h>
//#endif
#define WIN32_LEAN_AND_MEAN
#include <Windows.h> // to have IsTextUnicode, MultiByteToWideChar, WideCharToMultiByte to handle unicode files
#include <windows.h> // to have IsTextUnicode, MultiByteToWideChar, WideCharToMultiByte to handle unicode files
// to have "MessageBoxA" to display error messages for openFilHelper
#endif

14
include/zmq.h
View File

@ -30,13 +30,15 @@ extern "C" {
#include "winsock2.h"
#endif
/* Microsoft Visual Studio uses non-standard way to export/import symbols. */
#if defined ZMQ_BUILDING_LIBZMQ_WITH_MSVC
#define ZMQ_EXPORT __declspec(dllexport)
#elif defined _MSC_VER
#define ZMQ_EXPORT __declspec(dllimport)
/* Win32 needs special handling for DLL exports */
#if defined _WIN32
# if defined DLL_EXPORT
# define ZMQ_EXPORT __declspec(dllexport)
# else
# define ZMQ_EXPORT __declspec(dllimport)
# endif
#else
#define ZMQ_EXPORT
# define ZMQ_EXPORT
#endif
/******************************************************************************/

2
src/Makefile.am
View File

@ -176,7 +176,7 @@ libzmq_la_SOURCES = app_thread.hpp \
zmq_listener.cpp
if ON_MINGW
libzmq_la_LDFLAGS = -no-undefined -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
else
libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
endif