Wundef warnings - change #if to #ifdef

mpictor · mpictor · commit 66110400e14d · 2013-09-15T15:37:56.000-04:00
diff --git a/src/express/hash.c b/src/express/hash.c
@@ -125,7 +125,7 @@ static void     HASHexpand_table( Hash_Table );
 ** Local data
 */
 
-# if HASH_STATISTICS
+# ifdef HASH_STATISTICS
 static long     HashAccesses, HashCollisions;
 # endif
 
@@ -174,15 +174,15 @@ HASHcreate( unsigned count ) {
     table->maxp = MUL( count, SEGMENT_SIZE_SHIFT );
     table->MinLoadFactor = 1;
     table->MaxLoadFactor = MAX_LOAD_FACTOR;
-# if HASH_DEBUG
+# ifdef HASH_DEBUG
     fprintf( stderr,
              "[HASHcreate] table %x count %d maxp %d SegmentCount %d\n",
              table,
              count,
              table->maxp,
              table->SegmentCount );
 # endif
-# if HASH_STATISTICS
+# ifdef HASH_STATISTICS
     HashAccesses = HashCollisions = 0;
 # endif
     return( table );
@@ -305,7 +305,7 @@ HASHdestroy( Hash_Table table ) {
             }
         }
         HASH_Table_destroy( table );
-# if HASH_STATISTICS && HASH_DEBUG
+# if defined(HASH_STATISTICS) && defined(HASH_DEBUG)
         fprintf( stderr,
                  "[hdestroy] Accesses %ld Collisions %ld\n",
                  HashAccesses,
@@ -325,7 +325,7 @@ HASHsearch( Hash_Table table, Element item, Action action ) {
     Element deleteme;
 
     assert( table != HASH_NULL ); /* Kinder really than return(NULL); */
-# if HASH_STATISTICS
+# ifdef HASH_STATISTICS
     HashAccesses++;
 # endif
     h = HASHhash( item->key, table );
@@ -347,7 +347,7 @@ HASHsearch( Hash_Table table, Element item, Action action ) {
     while( q != NULL && strcmp( q->key, item->key ) ) {
         p = &q->next;
         q = *p;
-# if HASH_STATISTICS
+# ifdef HASH_STATISTICS
         HashCollisions++;
 # endif
     }
diff --git a/src/express/memory.c b/src/express/memory.c
@@ -78,7 +78,7 @@ Freelist * create_freelist( struct freelist_head * flh, int bytes ) {
 
 void
 _MEMinitialize() {
-#if DEBUG_MALLOC
+#ifdef DEBUG_MALLOC
     malloc_debug( 2 );
 #endif
 }
@@ -108,7 +108,7 @@ void MEMinitialize( struct freelist_head * flh, int size, int alloc1, int alloc2
         ERRORnospace();
     }
 
-#if SPACE_PROFILE
+#ifdef SPACE_PROFILE
     flh->count = 0;
 #endif /*SPACE_PROFILE*/
 
@@ -139,7 +139,7 @@ Generic MEM_new( struct freelist_head * flh ) {
     }
 #endif
 
-#if SPACE_PROFILE
+#ifdef SPACE_PROFILE
     flh->count++;
 #endif /*SPACE_PROFILE*/
 
diff --git a/src/express/resolve.c b/src/express/resolve.c
@@ -368,7 +368,7 @@ void EXP_resolve( Expression expr, Scope scope, Type typecheck ) {
                                              f->u.func->pcount );
                 }
 
-#if future_work
+#ifdef future_work
                 if( EXPRESS_lint ) {
                     /* verify parameters match function call */
                 }

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ void EXP_resolve( Expression expr, Scope scope, Type typecheck ) {`
`368`	`368`	`f->u.func->pcount );`
`369`	`369`	`}`
`370`	`370`
`371`		`-#if future_work`
	`371`	`+#ifdef future_work`
`372`	`372`	`if( EXPRESS_lint ) {`
`373`	`373`	`/* verify parameters match function call */`
`374`	`374`	`}`