summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Antonuk <aega@med.umich.edu>2012-10-02 10:53:00 -0400
committerAlan Antonuk <aega@med.umich.edu>2012-10-02 10:53:00 -0400
commit47fe792182ec79accc78a2de0257cd8cca9cf777 (patch)
tree0d4fe99852e1bfea20d265e3cd3f21fa7791e8bd
parent8c5b5d3244ecd391a5d2db2f101aab353c6c00c7 (diff)
downloadrabbitmq-c-github-ask-47fe792182ec79accc78a2de0257cd8cca9cf777.tar.gz
Make inttypes.h available when compiling for msvc
Test programs require inttypes.h which MSVC doesn't supply at any version (stdint.h is supplied at 1600+). Make it available in these situations
-rw-r--r--tests/CMakeLists.txt7
-rw-r--r--tests/win32/msinttypes/inttypes.h (renamed from librabbitmq/win32/msinttypes/inttypes.h)0
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 93ccb9a..69ff32d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,12 @@
include_directories(${LIBRABBITMQ_INCLUDE_DIRS})
+if (MSVC)
+ # No version of MSVC has inttypes.h, this uses the msinttypes
+ # Note this includes stdint.h which is either in
+ # ../librabbitmq/win32/msinttypes or in a standard location
+ include_directories(win32/msinttypes)
+endif (MSVC)
+
add_executable(test_parse_url test_parse_url.c)
target_link_libraries(test_parse_url rabbitmq)
add_test(parse_url test_parse_url)
diff --git a/librabbitmq/win32/msinttypes/inttypes.h b/tests/win32/msinttypes/inttypes.h
index 4b3828a..4b3828a 100644
--- a/librabbitmq/win32/msinttypes/inttypes.h
+++ b/tests/win32/msinttypes/inttypes.h