diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-08-20 20:47:34 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-08-20 20:47:34 +0000 |
| commit | 763d1e9a8ed2e44419760db370e9280426a0b617 (patch) | |
| tree | f4c5765dfe86b65375a06cc505a8334361cffadd /pjlib/include | |
| parent | dc216fbe98f8335de253cf671528b6e0dc2cb509 (diff) | |
Finishing autoconf work, also fixed compilation error in publish.h
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@689 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/include')
| -rw-r--r-- | pjlib/include/pj/compat/m_auto.h.in | 38 | ||||
| -rw-r--r-- | pjlib/include/pj/config.h | 16 |
2 files changed, 52 insertions, 2 deletions
diff --git a/pjlib/include/pj/compat/m_auto.h.in b/pjlib/include/pj/compat/m_auto.h.in new file mode 100644 index 00000000..c429019b --- /dev/null +++ b/pjlib/include/pj/compat/m_auto.h.in @@ -0,0 +1,38 @@ +/* $Id$ */ +/* + * Copyright (C)2003-2006 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __PJ_COMPAT_M_AUTO_H__ +#define __PJ_COMPAT_M_AUTO_H__ + +/** + * @file m_auto.h + * @brief Automatically generated process definition file. + */ + +#undef PJ_M_NAME + +#undef PJ_IS_LITTLE_ENDIAN +#undef PJ_IS_BIG_ENDIAN + +/* Specify if floating point is present/desired */ +#undef PJ_HAS_FLOATING_POINT + +/* Deprecated */ +#define PJ_HAS_PENTIUM 0 + +#endif /* __PJ_COMPAT_M_AUTO_H__ */ diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h index 0ceb863e..71bf37c3 100644 --- a/pjlib/include/pj/config.h +++ b/pjlib/include/pj/config.h @@ -39,7 +39,13 @@ /******************************************************************** * Include target OS specific configuration. */ -#if defined(PJ_WIN32_WINCE) || defined(_WIN32_WCE) || defined(UNDER_CE) +#if defined(PJ_AUTOCONF) + /* + * Autoconf + */ +# include <pj/compat/os_auto.h> + +#elif defined(PJ_WIN32_WINCE) || defined(_WIN32_WCE) || defined(UNDER_CE) /* * Windows CE */ @@ -108,7 +114,13 @@ /******************************************************************** * Target machine specific configuration. */ -#if defined (PJ_M_I386) || defined(_i386_) || defined(i_386_) || \ +#if defined(PJ_AUTOCONF) + /* + * Autoconf configured + */ +#include <pj/compat/m_auto.h> + +#elif defined (PJ_M_I386) || defined(_i386_) || defined(i_386_) || \ defined(_X86_) || defined(x86) || defined(__i386__) || \ defined(__i386) || defined(_M_IX86) || defined(__I86__) /* |