diff options
Diffstat (limited to 'src/dbinc/globals.h')
| -rw-r--r-- | src/dbinc/globals.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/dbinc/globals.h b/src/dbinc/globals.h index 95e5c118..becd6365 100644 --- a/src/dbinc/globals.h +++ b/src/dbinc/globals.h @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -52,21 +52,27 @@ typedef struct __db_globals { char error_buf[40]; /* Error string buffer. */ - int uid_init; /* srand set in UID generator */ + int random_seeded; /* Has __os_srandom been called? */ - u_long rand_next; /* rand/srand value */ +#if defined(HAVE_RANDOM_R) + struct random_data random_data; /* srandom_r/random_r argument */ + char random_state[64]; /* random number state */ +#elif !defined(HAVE_RAND) && !defined(HAVE_RANDOM) + u_long rand_next; /* next rand value for clib/rand.c */ +#endif u_int32_t fid_serial; /* file id counter */ int db_errno; /* Errno value if not available */ - size_t num_active_pids; /* number of entries in active_pids */ - - size_t size_active_pids; /* allocated size of active_pids */ + char *saved_errstr; /* saved error string from backup */ - pid_t *active_pids; /* array active pids */ + char *time_format; /* strftime-format for printing dates */ - char *saved_errstr; /* saved error string from backup */ +#if defined(HAVE_ERROR_HISTORY) && defined(HAVE_PTHREAD_SELF) + pthread_key_t msgs_key; + pthread_once_t thread_once; +#endif /* Underlying OS interface jump table.*/ void (*j_assert) __P((const char *, const char *, int)); |