Fix IRIX sc_mask conflict

[openldap] / servers / slapd / back-sql / schema-map.h

diff --git a/servers/slapd/back-sql/schema-map.h b/servers/slapd/back-sql/schema-map.h
index 3db6331ddee0498c934ee001f5d2345066f75028..f2fc02bbfa8dcf511008c6ca114613e58687db3f 100644 (file)
--- a/servers/slapd/back-sql/schema-map.h
+++ b/servers/slapd/back-sql/schema-map.h
@@ -16,29 +16,29 @@ typedef struct
  char *name;
  char *keytbl;
  char *keycol;
- char *create_proc;//expected to return keyval of newly created entry
- char *delete_proc;//supposed to expect keyval as parameter and delete all the attributes as well
- int expect_return; //flags whether delete_proc is a function (whether back-sql should bind first parameter as output for return code)
+ char *create_proc; /*expected to return keyval of newly created entry*/
+ char *delete_proc;/*supposed to expect keyval as parameter and delete all the attributes as well*/
+ int expect_return; /*flags whether delete_proc is a function (whether back-sql should bind first parameter as output for return code)*/
  unsigned long id;
  Avlnode *attrs;
 }backsql_oc_map_rec;
 
 typedef struct
 {
- char *name;//literal name of corresponding LDAP attribute type
+ char *name;/*literal name of corresponding LDAP attribute type*/
  char *from_tbls;
  char *join_where;
  char *sel_expr;
- char *add_proc; //supposed to expect 2 binded values: entry keyval and attr. value to add, like "add_name(?,?,?)"
- char *delete_proc; //supposed to expect 2 binded values: entry keyval and attr. value to delete
- char *query; //for optimization purposes attribute load query is preconstructed from parts on schemamap load time
- //following flags are bitmasks (first bit used for add_proc, second - for modify, third - for delete_proc)
- int param_order; //order of parameters for procedures above; 1 means "data then keyval", 0 means "keyval then data"
- int expect_return; //flags whether one or more of procedures is a function (whether back-sql should bind first parameter as output for return code)
- char *sel_expr_u; // TimesTen
+ char *add_proc; /*supposed to expect 2 binded values: entry keyval and attr. value to add, like "add_name(?,?,?)"*/
+ char *delete_proc; /*supposed to expect 2 binded values: entry keyval and attr. value to delete*/
+ char *query; /*for optimization purposes attribute load query is preconstructed from parts on schemamap load time*/
+ /*following flags are bitmasks (first bit used for add_proc, second - for modify, third - for delete_proc)*/
+ int param_order; /*order of parameters for procedures above; 1 means "data then keyval", 0 means "keyval then data"*/
+ int expect_return; /*flags whether one or more of procedures is a function (whether back-sql should bind first parameter as output for return code)*/
+ char *sel_expr_u; /* TimesTen */
 }backsql_at_map_rec;
 
-//defines to support bitmasks above
+/*defines to support bitmasks above*/
 #define BACKSQL_ADD    1
 #define BACKSQL_DEL    2
 
@@ -49,3 +49,4 @@ backsql_at_map_rec* backsql_at_with_name(backsql_oc_map_rec* objclass,char* attr
 int backsql_destroy_schema_map(backsql_info *si);
 
 #endif
+