diff options
| author | Torgeir Lerkerød <torgeir.lerkerod@gmail.com> | 2009-10-20 18:33:25 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-10-21 15:46:38 +0200 |
| commit | 95ce7dff20d5629eff16cc6f7527c542987d8eb0 (patch) | |
| tree | 990e8b5dd63118fbc7ff86248f6ac45303329cbe /source4/lib/ldb/ldb_map/ldb_map.h | |
| parent | 6e5dad49d9cfc8e8a3fc6c1e60733d6e25865ef7 (diff) | |
| download | samba-95ce7dff20d5629eff16cc6f7527c542987d8eb0.tar.gz samba-95ce7dff20d5629eff16cc6f7527c542987d8eb0.tar.bz2 samba-95ce7dff20d5629eff16cc6f7527c542987d8eb0.zip | |
S4: ldb_map modules uses defines that are reserved
On OpenSolaris MAP_RENAME and friends are defined in <sys/mman.h> e.g. mmap and friends. So on these systems MAP_* have a meaning. Cleaned up LDB name space by adding LDB_ in front of MAP_* e.g. MAP_RENAME => LDB_MAP_RENAME
Signed-off-by: Torgeir Lerkerød <torgeir.lerkerod@gmail.com>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/lib/ldb/ldb_map/ldb_map.h')
| -rw-r--r-- | source4/lib/ldb/ldb_map/ldb_map.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/ldb/ldb_map/ldb_map.h b/source4/lib/ldb/ldb_map/ldb_map.h index 3c1fe80895..21937bcfb3 100644 --- a/source4/lib/ldb/ldb_map/ldb_map.h +++ b/source4/lib/ldb/ldb_map/ldb_map.h @@ -59,11 +59,11 @@ struct ldb_map_attribute { const char *local_name; /* local name */ enum ldb_map_attr_type { - MAP_IGNORE, /* Ignore this local attribute. Doesn't exist remotely. */ - MAP_KEEP, /* Keep as is. Same name locally and remotely. */ - MAP_RENAME, /* Simply rename the attribute. Name changes, data is the same */ - MAP_CONVERT, /* Rename + convert data */ - MAP_GENERATE /* Use generate function for generating new name/data. + LDB_MAP_IGNORE, /* Ignore this local attribute. Doesn't exist remotely. */ + LDB_MAP_KEEP, /* Keep as is. Same name locally and remotely. */ + LDB_MAP_RENAME, /* Simply rename the attribute. Name changes, data is the same */ + LDB_MAP_CONVERT, /* Rename + convert data */ + LDB_MAP_GENERATE /* Use generate function for generating new name/data. Used for generating attributes based on multiple remote attributes. */ } type; |