Permalink
Browse files

Declate out_pgsql as extern in header file. Rename __unused since it …

…may clash with other definitions.

git-svn-id: http://svn.openstreetmap.org/applications/utils/export/osm2pgsql@13578 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
  • Loading branch information...
1 parent a5c2e6e commit 15081fbfed1cb2e7c714cf127d17503796526190 jonb committed Feb 7, 2009
Showing with 6 additions and 6 deletions.
  1. +2 −2 middle-pgsql.c
  2. +2 −2 middle-ram.c
  3. +1 −1 output-pgsql.c
  4. +1 −1 output-pgsql.h
View
4 middle-pgsql.c
@@ -208,8 +208,8 @@ static void percolate_up( int pos )
}
}
-#define __unused __attribute__ ((unused))
-static int pgsql_ram_nodes_set(int id, double lat, double lon, struct keyval *tags __unused)
+#define UNUSED __attribute__ ((unused))
+static int pgsql_ram_nodes_set(int id, double lat, double lon, struct keyval *tags UNUSED)
{
int block = id2block(id);
int offset = id2offset(id);
View
4 middle-ram.c
@@ -94,8 +94,8 @@ static inline int block2id(int block, int offset)
return ((block - NUM_BLOCKS/2) << BLOCK_SHIFT) + offset;
}
-#define __unused __attribute__ ((unused))
-static int ram_nodes_set(int id, double lat, double lon, struct keyval *tags __unused)
+#define UNUSED __attribute__ ((unused))
+static int ram_nodes_set(int id, double lat, double lon, struct keyval *tags UNUSED)
{
int block = id2block(id);
int offset = id2offset(id);
View
2 output-pgsql.c
@@ -1150,7 +1150,7 @@ static int pgsql_add_relation(int id, struct member *members, int member_count,
return pgsql_process_relation(id, members, member_count, tags, 0);
}
-#define __unused __attribute__ ((unused))
+#define UNUSED __attribute__ ((unused))
/* Delete is easy, just remove all traces of this object. We don't need to
* worry about finding objects that depend on it, since the same diff must
View
2 output-pgsql.h
@@ -8,6 +8,6 @@
#include "output.h"
-struct output_t out_pgsql;
+extern struct output_t out_pgsql;
#endif

0 comments on commit 15081fb

Please sign in to comment.