summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimarom <imarom@cisco.com>2016-02-29 10:29:52 +0200
committerimarom <imarom@cisco.com>2016-02-29 10:29:52 +0200
commit584cc84966c0980bb22197f633fb08e3ddcac7bf (patch)
tree652772f44cf188ef6e55e3d8340e1f57c6aa283b
parente71182209be5870d31cc409a32e3d81f1641b00e (diff)
stdint.h on Fedora dist. requires explicit defines for
format macros and limit macros - updated the WAF makefiles
-rwxr-xr-xlinux/ws_main.py2
-rwxr-xr-xlinux_dpdk/ws_main.py2
-rw-r--r--src/main_dpdk.cpp7
3 files changed, 4 insertions, 7 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py
index a8e7deef..9422a8ff 100755
--- a/linux/ws_main.py
+++ b/linux/ws_main.py
@@ -243,6 +243,8 @@ cxxflags_base =['-DWIN_UCODE_SIM',
'-D_BYTE_ORDER',
'-D_LITTLE_ENDIAN',
'-DLINUX',
+ '-D__STDC_LIMIT_MACROS',
+ '-D__STDC_FORMAT_MACROS',
'-g',
'-Wno-deprecated-declarations',
'-std=c++0x',
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
index 0d96cfae..ad8d259d 100755
--- a/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@ -387,6 +387,8 @@ common_flags = ['-DWIN_UCODE_SIM',
'-Wno-format',
'-Wno-deprecated-declarations',
'-DRTE_DPDK',
+ '-D__STDC_LIMIT_MACROS',
+ '-D__STDC_FORMAT_MACROS',
'-include','../src/pal/linux_dpdk/dpdk22/rte_config.h'
]
diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index 88917269..5c7be19e 100644
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -18,13 +18,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
-
-// DPDK c++ issue
-#define UINT8_MAX 255
-#define UINT16_MAX 0xFFFF
-#define __STDC_FORMAT_MACROS
-// DPDK c++ issue
-
#include <pwd.h>
#include <rte_common.h>
#include <rte_log.h>