comparison UnitTestsSources/UnitTestsMain.cpp @ 1976:325772dadcd6

Macro "__linux" (now obsolete) replaced by macro "__linux__"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 14 Apr 2016 17:34:43 +0200
parents 869a87c08673
children e29aea2349b9
comparison
equal deleted inserted replaced
1975:730eedd9a5dc 1976:325772dadcd6
456 Toolbox::UrlDecode(s); 456 Toolbox::UrlDecode(s);
457 ASSERT_EQ("(2000,00A4) Other", s); 457 ASSERT_EQ("(2000,00A4) Other", s);
458 } 458 }
459 459
460 460
461 #if defined(__linux) 461 #if defined(__linux__)
462 TEST(OrthancInitialization, AbsoluteDirectory) 462 TEST(OrthancInitialization, AbsoluteDirectory)
463 { 463 {
464 ASSERT_EQ("/tmp/hello", Configuration::InterpretRelativePath("/tmp", "hello")); 464 ASSERT_EQ("/tmp/hello", Configuration::InterpretRelativePath("/tmp", "hello"));
465 ASSERT_EQ("/tmp", Configuration::InterpretRelativePath("/tmp", "/tmp")); 465 ASSERT_EQ("/tmp", Configuration::InterpretRelativePath("/tmp", "/tmp"));
466 } 466 }
630 ASSERT_EQ(ImageFormat_Png, StringToImageFormat(EnumerationToString(ImageFormat_Png))); 630 ASSERT_EQ(ImageFormat_Png, StringToImageFormat(EnumerationToString(ImageFormat_Png)));
631 } 631 }
632 632
633 633
634 634
635 #if defined(__linux) 635 #if defined(__linux__)
636 #include <endian.h> 636 #include <endian.h>
637 #elif defined(__FreeBSD__) 637 #elif defined(__FreeBSD__)
638 #include <machine/endian.h> 638 #include <machine/endian.h>
639 #endif 639 #endif
640 640
655 655
656 /** 656 /**
657 * Linux. 657 * Linux.
658 **/ 658 **/
659 659
660 #elif defined(__linux) || defined(__FreeBSD_kernel__) 660 #elif defined(__linux__) || defined(__FreeBSD_kernel__)
661 661
662 #if !defined(__BYTE_ORDER) 662 #if !defined(__BYTE_ORDER)
663 # error Support your platform here 663 # error Support your platform here
664 #endif 664 #endif
665 665