diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-12-13 16:39:40 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-12-13 16:39:40 +0000 |
| commit | ece4c957988c3926f679f805294072c31de59bda (patch) | |
| tree | 18addab5cab2b5c8c7b1f120bf78c7114735ea63 /include | |
| parent | 7b5f4748fb368d81d588ae61a54d7a37c2f906ee (diff) | |
Resolve conflict and reset automerge.
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index e6835a030..49633f527 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -173,9 +173,6 @@ /* Define DAHDI headers version */ #undef HAVE_DAHDI_VERSION -/* Define to 1 if your system has /dev/urandom. */ -#undef HAVE_DEV_URANDOM - /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H |