[asterisk-commits] kpfleming: trunk r55329 - in /trunk: ./ apps/ channels/ channels/misdn/ main/...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sun Feb 18 08:03:43 MST 2007 

Author: kpfleming
Date: Sun Feb 18 09:03:42 2007
New Revision: 55329

URL: http://svn.digium.com/view/asterisk?view=rev&rev=55329
Log:
add -Wundef to the --enable-dev-mode flags, so that mistyped macro names in #if expressions will be caught
convert various #if expressions to #ifdef for macros that may not be defined (and where the value is not important)
Note: two of these changes are in bison generated files which is going to be inconvenient when they are regenerated

Modified:
    trunk/Makefile
    trunk/apps/app_voicemail.c
    trunk/channels/chan_misdn.c
    trunk/channels/chan_oss.c
    trunk/channels/misdn/isdn_msg_parser.c
    trunk/main/ast_expr2.c
    trunk/main/editline/refresh.c
    trunk/main/enum.c
    trunk/main/srv.c
    trunk/pbx/ael/ael.tab.c

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Feb 18 09:03:42 2007
@@ -189,7 +189,7 @@
 ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
 
 ifeq ($(AST_DEVMODE),yes)
-  ASTCFLAGS+=-Werror -Wunused
+  ASTCFLAGS+=-Werror -Wunused -Wundef
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Sun Feb 18 09:03:42 2007
@@ -415,9 +415,9 @@
 #define PWDCHANGE_EXTERNAL (1 << 2)
 static int pwdchange = PWDCHANGE_INTERNAL;
 
-#if ODBC_STORAGE
+#ifdef ODBC_STORAGE
 #define tdesc "Comedian Mail (Voicemail System) with ODBC Storage"
-#elif IMAP_STORAGE
+#elifdef IMAP_STORAGE
 #define tdesc "Comedian Mail (Voicemail System) with IMAP Storage"
 #else
 #define tdesc "Comedian Mail (Voicemail System)"

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Sun Feb 18 09:03:42 2007
@@ -2623,7 +2623,7 @@
 		return 0;
 	}
 	
-#if MISDN_DEBUG
+#ifdef MISDN_DEBUG
 	{
 		int i, max=5>frame->samples?frame->samples:5;
 		

Modified: trunk/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_oss.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/channels/chan_oss.c (original)
+++ trunk/channels/chan_oss.c Sun Feb 18 09:03:42 2007
@@ -1553,7 +1553,7 @@
 		return NULL;
 
   openit:
-#if TRYOPEN
+#ifdef TRYOPEN
 	if (setformat(o, O_RDWR) < 0) {	/* open device */
 		if (option_verbose > 0) {
 			ast_verbose(VERBOSE_PREFIX_2 "Device %s not detected\n", ctg);

Modified: trunk/channels/misdn/isdn_msg_parser.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/isdn_msg_parser.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/channels/misdn/isdn_msg_parser.c (original)
+++ trunk/channels/misdn/isdn_msg_parser.c Sun Feb 18 09:03:42 2007
@@ -65,7 +65,7 @@
 	dec_ie_progress(proceeding->PROGRESS, (Q931_info_t *)proceeding, &bc->progress_coding, &bc->progress_location, &bc->progress_indicator, nt, bc);
 	
 	
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing PROCEEDING Msg\n"); 
 #endif
 }
@@ -83,7 +83,7 @@
 		enc_ie_progress(&proceeding->PROGRESS, msg, 0, nt?1:5, 8, nt,bc);
   
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building PROCEEDING Msg\n"); 
 #endif
 	return msg; 
@@ -97,7 +97,7 @@
 	
 	dec_ie_progress(alerting->PROGRESS, (Q931_info_t *)alerting, &bc->progress_coding, &bc->progress_location, &bc->progress_indicator, nt, bc);
 	
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing ALERTING Msg\n"); 
 #endif
 
@@ -116,7 +116,7 @@
 	
 	if (nt) 
 		enc_ie_progress(&alerting->PROGRESS, msg, 0, nt?1:5, 8, nt,bc);
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building ALERTING Msg\n"); 
 #endif
 	return msg; 
@@ -131,7 +131,7 @@
 	
 	dec_ie_progress(progress->PROGRESS, (Q931_info_t *)progress, &bc->progress_coding, &bc->progress_location, &bc->progress_indicator, nt, bc);
 	
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing PROGRESS Msg\n"); 
 #endif
 }
@@ -144,7 +144,7 @@
  
 	progress=(PROGRESS_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building PROGRESS Msg\n"); 
 #endif
 	return msg; 
@@ -156,7 +156,7 @@
 	SETUP_t *setup= (SETUP_t*)((unsigned long)msg->data+HEADER_LEN);
 	Q931_info_t *qi=(Q931_info_t*)((unsigned long)msg->data+HEADER_LEN);
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing SETUP Msg\n"); 
 #endif
 	{
@@ -331,7 +331,7 @@
 		enc_ie_complete(&setup->BEARER,msg, bc->sending_complete, nt, bc);
 	}
   
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building SETUP Msg\n"); 
 #endif
 	return msg; 
@@ -355,7 +355,7 @@
 		cb_log(1,bc->port,"CONNETED PN: %s cpn_dialplan:%d\n", connected_pn, type);
 	*/
 	
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing CONNECT Msg\n"); 
 #endif
 }
@@ -381,7 +381,7 @@
 		enc_ie_connected_pn(&connect->CONNECT_PN, msg, type,plan, present, screen, bc->cad, nt , bc);
 	}
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building CONNECT Msg\n"); 
 #endif
 	return msg; 
@@ -401,7 +401,7 @@
 	}
 	
 	dec_ie_progress(setup_acknowledge->PROGRESS, (Q931_info_t *)setup_acknowledge, &bc->progress_coding, &bc->progress_location, &bc->progress_indicator, nt, bc);
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing SETUP_ACKNOWLEDGE Msg\n"); 
 #endif
 
@@ -421,7 +421,7 @@
 	if (nt) 
 		enc_ie_progress(&setup_acknowledge->PROGRESS, msg, 0, nt?1:5, 8, nt,bc);
   
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building SETUP_ACKNOWLEDGE Msg\n"); 
 #endif
 	return msg; 
@@ -429,7 +429,7 @@
 
 static void parse_connect_acknowledge (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing CONNECT_ACKNOWLEDGE Msg\n"); 
 #endif
 
@@ -446,7 +446,7 @@
   
 	enc_ie_channel_id(&connect_acknowledge->CHANNEL_ID, msg, 1, bc->channel, nt,bc);
   
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building CONNECT_ACKNOWLEDGE Msg\n"); 
 #endif
 	return msg; 
@@ -454,7 +454,7 @@
 
 static void parse_user_information (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing USER_INFORMATION Msg\n"); 
 #endif
 
@@ -469,7 +469,7 @@
  
 	user_information=(USER_INFORMATION_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building USER_INFORMATION Msg\n"); 
 #endif
 	return msg; 
@@ -477,7 +477,7 @@
 
 static void parse_suspend_reject (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing SUSPEND_REJECT Msg\n"); 
 #endif
 
@@ -492,7 +492,7 @@
  
 	suspend_reject=(SUSPEND_REJECT_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building SUSPEND_REJECT Msg\n"); 
 #endif
 	return msg; 
@@ -500,7 +500,7 @@
 
 static void parse_resume_reject (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RESUME_REJECT Msg\n"); 
 #endif
 
@@ -515,7 +515,7 @@
  
 	resume_reject=(RESUME_REJECT_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RESUME_REJECT Msg\n"); 
 #endif
 	return msg; 
@@ -523,7 +523,7 @@
 
 static void parse_hold (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing HOLD Msg\n"); 
 #endif
 
@@ -538,7 +538,7 @@
  
 	hold=(HOLD_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building HOLD Msg\n"); 
 #endif
 	return msg; 
@@ -546,7 +546,7 @@
 
 static void parse_suspend (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing SUSPEND Msg\n"); 
 #endif
 
@@ -561,7 +561,7 @@
  
 	suspend=(SUSPEND_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building SUSPEND Msg\n"); 
 #endif
 	return msg; 
@@ -569,7 +569,7 @@
 
 static void parse_resume (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RESUME Msg\n"); 
 #endif
 
@@ -584,7 +584,7 @@
  
 	resume=(RESUME_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RESUME Msg\n"); 
 #endif
 	return msg; 
@@ -592,7 +592,7 @@
 
 static void parse_hold_acknowledge (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing HOLD_ACKNOWLEDGE Msg\n"); 
 #endif
 
@@ -607,7 +607,7 @@
  
 	hold_acknowledge=(HOLD_ACKNOWLEDGE_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building HOLD_ACKNOWLEDGE Msg\n"); 
 #endif
 	return msg; 
@@ -615,7 +615,7 @@
 
 static void parse_suspend_acknowledge (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing SUSPEND_ACKNOWLEDGE Msg\n"); 
 #endif
 
@@ -630,7 +630,7 @@
  
 	suspend_acknowledge=(SUSPEND_ACKNOWLEDGE_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building SUSPEND_ACKNOWLEDGE Msg\n"); 
 #endif
 	return msg; 
@@ -638,7 +638,7 @@
 
 static void parse_resume_acknowledge (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RESUME_ACKNOWLEDGE Msg\n"); 
 #endif
 
@@ -653,7 +653,7 @@
  
 	resume_acknowledge=(RESUME_ACKNOWLEDGE_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RESUME_ACKNOWLEDGE Msg\n"); 
 #endif
 	return msg; 
@@ -661,7 +661,7 @@
 
 static void parse_hold_reject (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing HOLD_REJECT Msg\n"); 
 #endif
 
@@ -676,7 +676,7 @@
  
 	hold_reject=(HOLD_REJECT_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building HOLD_REJECT Msg\n"); 
 #endif
 	return msg; 
@@ -684,7 +684,7 @@
 
 static void parse_retrieve (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RETRIEVE Msg\n"); 
 #endif
 
@@ -699,7 +699,7 @@
  
 	retrieve=(RETRIEVE_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RETRIEVE Msg\n"); 
 #endif
 	return msg; 
@@ -707,7 +707,7 @@
 
 static void parse_retrieve_acknowledge (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RETRIEVE_ACKNOWLEDGE Msg\n"); 
 #endif
 
@@ -723,7 +723,7 @@
 	retrieve_acknowledge=(RETRIEVE_ACKNOWLEDGE_t*)((msg->data+HEADER_LEN)); 
 
 	enc_ie_channel_id(&retrieve_acknowledge->CHANNEL_ID, msg, 1, bc->channel, nt,bc);
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RETRIEVE_ACKNOWLEDGE Msg\n"); 
 #endif
 	return msg; 
@@ -731,7 +731,7 @@
 
 static void parse_retrieve_reject (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RETRIEVE_REJECT Msg\n"); 
 #endif
 
@@ -746,7 +746,7 @@
  
 	retrieve_reject=(RETRIEVE_REJECT_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RETRIEVE_REJECT Msg\n"); 
 #endif
 	return msg; 
@@ -762,7 +762,7 @@
 	if (cause>0) bc->cause=cause;
 
 	dec_ie_progress(disconnect->PROGRESS, (Q931_info_t *)disconnect, &bc->progress_coding, &bc->progress_location, &bc->progress_indicator, nt, bc);
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing DISCONNECT Msg\n"); 
 #endif
 
@@ -780,7 +780,7 @@
 	enc_ie_cause(&disconnect->CAUSE, msg, (nt)?1:0, bc->out_cause,nt,bc);
 	if (nt) enc_ie_progress(&disconnect->PROGRESS, msg, 0, nt?1:5, 8 ,nt,bc);
   
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building DISCONNECT Msg\n"); 
 #endif
 	return msg; 
@@ -793,7 +793,7 @@
 
 	struct misdn_stack *stack=get_stack_by_bc(bc);
 	
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RESTART Msg\n");
 #endif
   
@@ -817,7 +817,7 @@
  
 	restart=(RESTART_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RESTART Msg\n"); 
 #endif
 	return msg; 
@@ -832,7 +832,7 @@
   
 	dec_ie_cause(release->CAUSE, (Q931_info_t *)(release), &location, &cause, nt,bc);
 	if (cause>0) bc->cause=cause;
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RELEASE Msg\n"); 
 #endif
 
@@ -850,7 +850,7 @@
 	if (bc->out_cause>= 0)
 		enc_ie_cause(&release->CAUSE, msg, nt?1:0, bc->out_cause, nt,bc);
   
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RELEASE Msg\n"); 
 #endif
 	return msg; 
@@ -885,7 +885,7 @@
 	dec_ie_cause(release_complete->CAUSE, (Q931_info_t *)(release_complete), &location, &cause, nt,bc);
 	if (cause>0) bc->cause=cause;
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing RELEASE_COMPLETE Msg\n"); 
 #endif
 }
@@ -900,7 +900,7 @@
 	
 	enc_ie_cause(&release_complete->CAUSE, msg, nt?1:0, bc->out_cause, nt,bc);
   
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building RELEASE_COMPLETE Msg\n"); 
 #endif
 	return msg; 
@@ -914,7 +914,7 @@
 	unsigned char *p = NULL;
 	int err;
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing FACILITY Msg\n"); 
 #endif
 
@@ -943,7 +943,7 @@
 	FACILITY_t *facility = (FACILITY_t*)(msg->data+HEADER_LEN); 
 	Q931_info_t *qi;
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building FACILITY Msg\n"); 
 #endif
 	
@@ -971,7 +971,7 @@
 
 static void parse_notify (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing NOTIFY Msg\n"); 
 #endif
 }
@@ -984,7 +984,7 @@
  
 	notify=(NOTIFY_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building NOTIFY Msg\n"); 
 #endif
 	return msg; 
@@ -992,7 +992,7 @@
 
 static void parse_status_enquiry (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing STATUS_ENQUIRY Msg\n"); 
 #endif
 }
@@ -1005,7 +1005,7 @@
  
 	status_enquiry=(STATUS_ENQUIRY_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building STATUS_ENQUIRY Msg\n"); 
 #endif
 	return msg; 
@@ -1024,7 +1024,7 @@
 		strcpy(bc->info_dad, number);
 		strcpy(bc->keypad,keypad);
 	}
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing INFORMATION Msg\n"); 
 #endif
 }
@@ -1048,7 +1048,7 @@
 		}
 	}
   
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building INFORMATION Msg\n"); 
 #endif
 	return msg; 
@@ -1065,7 +1065,7 @@
 	if (cause>0) bc->cause=cause;
 	;
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing STATUS Msg\n"); 
 #endif
 }
@@ -1078,7 +1078,7 @@
  
 	status=(STATUS_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building STATUS Msg\n"); 
 #endif
 	return msg; 
@@ -1086,7 +1086,7 @@
 
 static void parse_timeout (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt) 
 {
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Parsing STATUS Msg\n"); 
 #endif 
 }
@@ -1099,7 +1099,7 @@
  
 	status=(STATUS_t*)((msg->data+HEADER_LEN)); 
 
-#if DEBUG 
+#ifdef DEBUG 
 	printf("Building STATUS Msg\n"); 
 #endif
 	return msg; 

Modified: trunk/main/ast_expr2.c
URL: http://svn.digium.com/view/asterisk/trunk/main/ast_expr2.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/main/ast_expr2.c (original)
+++ trunk/main/ast_expr2.c Sun Feb 18 09:03:42 2007
@@ -367,7 +367,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# ifdef YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)

Modified: trunk/main/editline/refresh.c
URL: http://svn.digium.com/view/asterisk/trunk/main/editline/refresh.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/main/editline/refresh.c (original)
+++ trunk/main/editline/refresh.c Sun Feb 18 09:03:42 2007
@@ -215,7 +215,7 @@
 	prompt_print(el, EL_PROMPT);
 
 	/* draw the current input buffer */
-#if notyet
+#ifdef notyet
 	termsz = el->el_term.t_size.h * el->el_term.t_size.v;
 	if (el->el_line.lastchar - el->el_line.buffer > termsz) {
 		/*

Modified: trunk/main/enum.c
URL: http://svn.digium.com/view/asterisk/trunk/main/enum.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/main/enum.c (original)
+++ trunk/main/enum.c Sun Feb 18 09:03:42 2007
@@ -48,8 +48,10 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef __APPLE__
 #if __APPLE_CC__ >= 1495
 #include <arpa/nameser_compat.h>
+#endif
 #endif
 #include <resolv.h>
 #include <stdlib.h>

Modified: trunk/main/srv.c
URL: http://svn.digium.com/view/asterisk/trunk/main/srv.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/main/srv.c (original)
+++ trunk/main/srv.c Sun Feb 18 09:03:42 2007
@@ -36,8 +36,10 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef __APPLE__
 #if __APPLE_CC__ >= 1495
 #include <arpa/nameser_compat.h>
+#endif
 #endif
 #include <resolv.h>
 #include <stdio.h>

Modified: trunk/pbx/ael/ael.tab.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael.tab.c?view=diff&rev=55329&r1=55328&r2=55329
==============================================================================
--- trunk/pbx/ael/ael.tab.c (original)
+++ trunk/pbx/ael/ael.tab.c Sun Feb 18 09:03:42 2007
@@ -335,7 +335,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# ifdef YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)

More information about the asterisk-commits mailing list