Fix / hide some warnings on Linux.

diff --git a/src/KM_prng.cpp b/src/KM_prng.cpp
index 161274665d7d9305b0efc6edb9b47fa91655760e..4b0adf6c609e6f97ccd311dbae51e6f0fb71c6aa 100755 (executable)
--- a/src/KM_prng.cpp
+++ b/src/KM_prng.cpp
@@ -116,7 +116,8 @@ public:
 
     AutoMutex Lock(m_Lock);
     AES_set_encrypt_key(sha_buf, RNG_KEY_SIZE_BITS, &m_Context);
-    *(ui32_t*)(m_ctr_buf + 12) = 1;
+    ui32_t* m_ctr_buf_int = reinterpret_cast<ui32_t*> (m_ctr_buf + 12);
+    *m_ctr_buf_int = 1;
   }
 
   //
@@ -130,7 +131,8 @@ public:
     while ( gen_count + RNG_BLOCK_SIZE <= len )
       {
        AES_encrypt(m_ctr_buf, buf + gen_count, &m_Context);
-       *(ui32_t*)(m_ctr_buf + 12) += 1;
+       ui32_t* m_ctr_buf_int = reinterpret_cast<ui32_t*> (m_ctr_buf + 12);
+       *m_ctr_buf_int += 1;
        gen_count += RNG_BLOCK_SIZE;
       }
 

diff --git a/wscript b/wscript
index d823be28d8f2de698453edf5f277e0895520ada6..c1a1e794b3cb2cf2ee16112c62e5d84f921f0d93 100644 (file)
--- a/wscript
+++ b/wscript
@@ -19,12 +19,16 @@ def configure(conf):
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.TARGET_OSX = sys.platform == 'darwin'
+    conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX
     conf.env.STATIC = conf.options.static
     conf.env.VERSION = VERSION
 
     if conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter', '-Wno-unused-local-typedef'])
 
+    if conf.env.TARGET_LINUX:
+        conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
+
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
 
     if conf.options.target_windows: