From e29ec54993de9adaf636d9ef736eb0560fe6c8b8 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Thu, 29 Jan 2009 18:56:16 +0000
Subject: [PATCH] fix crazy build issue with broken gcc optimizer on bleeding
 edge ubuntu

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@627 a93c3328-9c30-0410-af19-c9cd2b2d52af
---
 libs/freetdm/configure.ac                     |  2 +-
 .../ozmod_wanpipe/wanpipe_tdm_api_iface.h     | 36 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/libs/freetdm/configure.ac b/libs/freetdm/configure.ac
index 7451ecc647..cb613a79d5 100644
--- a/libs/freetdm/configure.ac
+++ b/libs/freetdm/configure.ac
@@ -51,7 +51,7 @@ AX_COMPILER_VENDOR
 
 case "${ax_cv_c_compiler_vendor}" in
 gnu)
-    COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
+    COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
     ;;
 sun)
     COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -D__FUNCTION__=__func__ -xvpara"
diff --git a/libs/freetdm/src/ozmod/ozmod_wanpipe/wanpipe_tdm_api_iface.h b/libs/freetdm/src/ozmod/ozmod_wanpipe/wanpipe_tdm_api_iface.h
index cfb4c151ac..3801ff9c8c 100644
--- a/libs/freetdm/src/ozmod/ozmod_wanpipe/wanpipe_tdm_api_iface.h
+++ b/libs/freetdm/src/ozmod/ozmod_wanpipe/wanpipe_tdm_api_iface.h
@@ -187,40 +187,40 @@ enum wanpipe_tdm_api_events {
 
 typedef struct {
 
-	uint8_t	type;
-	uint8_t	mode;
-	uint32_t	time_stamp;
-	uint8_t	channel;
-	uint32_t	chan_map;
-	uint8_t	span;
+	u_int8_t	type;
+	u_int8_t	mode;
+	u_int32_t	time_stamp;
+	u_int8_t	channel;
+	u_int32_t	chan_map;
+	u_int8_t	span;
 	union {
 		struct {
-			uint8_t	alarm;
+			u_int8_t	alarm;
 		} te1_alarm;
 		struct {
-			uint8_t	rbs_bits;
+			u_int8_t	rbs_bits;
 		} te1_rbs;
 		struct {
-			uint8_t	state;
-			uint8_t	sig;
+			u_int8_t	state;
+			u_int8_t	sig;
 		} rm_hook;
 		struct {
-			uint8_t	state;
+			u_int8_t	state;
 		} rm_ring;
 		struct {
-			uint8_t	type;
+			u_int8_t	type;
 		} rm_tone;
 		struct {
-			uint8_t	digit;	/* DTMF: digit  */
-			uint8_t	port;	/* DTMF: SOUT/ROUT */
-			uint8_t	type;	/* DTMF: PRESET/STOP */
+			u_int8_t	digit;	/* DTMF: digit  */
+			u_int8_t	port;	/* DTMF: SOUT/ROUT */
+			u_int8_t	type;	/* DTMF: PRESET/STOP */
 		} dtmf;
 		struct {
-			uint16_t	polarity;
-			uint16_t	ohttimer;
+			u_int16_t	polarity;
+			u_int16_t	ohttimer;
 		} rm_common;
 		struct{
-			uint16_t status;
+			u_int16_t status;
 		} linkstatus;
 	} wp_tdm_api_event_u;
 #define wp_tdm_api_event_type 		type