Fix (for real) NS_DEPRECATED_3_31

src/core/model/deprecated.h

@@ -60,6 +60,8 @@
 #define NS_DEPRECATED
 #endif
 
+#ifdef NS_DEPRECATED
 #define NS_DEPRECATED_3_31 NS_DEPRECATED
+#endif
 
 #endif /* NS3_DEPRECATED_H */

src/wscript

@@ -275,6 +275,7 @@ def ns3_python_bindings(bld):
             pymod.env.append_value('LINKFLAGS', '-Wl,-Bdynamic,--no-whole-archive')
     defines = list(pymod.env['DEFINES'])
     defines.extend(['NS_DEPRECATED=', 'NS3_DEPRECATED_H'])
+    defines.extend(['NS_DEPRECATED_3_31=', 'NS3_DEPRECATED_H'])
     if Utils.unversioned_sys_platform()== 'win32':
         try:
             defines.remove('_DEBUG') # causes undefined symbols on win32