diff options
| author | Peng Wu <alexepico@gmail.com> | 2014-01-26 14:58:27 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2014-01-26 14:58:27 +0800 |
| commit | aba1516229c018439459e0e20995e91c3aa6ea53 (patch) | |
| tree | b3b0d033f56090fb15e5c2dafc696e1f09e2caf3 /src | |
| parent | 432bf196a90313273490b683bfae8f128cf52018 (diff) | |
| download | ibus-libpinyin-aba1516229c018439459e0e20995e91c3aa6ea53.tar.gz ibus-libpinyin-aba1516229c018439459e0e20995e91c3aa6ea53.tar.xz ibus-libpinyin-aba1516229c018439459e0e20995e91c3aa6ea53.zip | |
drop uuid deps
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 18 | ||||
| -rw-r--r-- | src/PYUtil.h | 34 |
2 files changed, 2 insertions, 50 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3224d8b..087957c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,19 +18,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# @MAINTAINER_MODE_FALSE@skip_gentable=test -f $@ || - -# AM_CFLAGS = \ -# @IBUS_CFLAGS@ \ -# @SQLITE_CFLAGS@ \ -# -DPKGDATADIR=\"$(pkgdatadir)\" \ -# $(NULL) -# AM_CXXFLAGS = $(AM_CFLAGS) -# AM_LDADD = \ -# @IBUS_LIBS@ \ -# @SQLITE_LIBS@ \ -# $(NULL) -# libexec_PROGRAMS = ibus-engine-libpinyin ibus_engine_libpinyin_built_c_sources = \ @@ -144,11 +131,6 @@ ibus_engine_libpinyin_LDADD = \ @OPENCC_LIBS@ \ $(NULL) -if HAVE_LIBUUID -ibus_engine_libpinyin_CXXFLAGS += $(LIBUUID_CFLAGS) -ibus_engine_libpinyin_LDADD += $(LIBUUID_LIBS) -endif - ibus_engine_libpinyin_CXXFLAGS += \ -DLIBPINYIN_DATADIR=\"@LIBPINYIN_DATADIR@\/data\" \ $(NULL) diff --git a/src/PYUtil.h b/src/PYUtil.h index 46b0116..9d3b365 100644 --- a/src/PYUtil.h +++ b/src/PYUtil.h @@ -25,13 +25,7 @@ # include <config.h> #endif -#if defined(HAVE_UUID_CREATE) -# include <uuid.h> -#elif defined(HAVE_LIBUUID) -# include <uuid/uuid.h> -#endif -#include <sys/utsname.h> #include <cstdlib> #include <string> @@ -89,32 +83,7 @@ scmshm_test (guint modifiers, guint mask) return scmshm_filter (modifiers) == mask; } -class UUID { -public: - UUID (void) - { - uuid_t u; -#if defined(HAVE_UUID_CREATE) - gchar* uuid; - uuid_create (&u, 0); - uuid_to_string (&u, &uuid, 0); - g_strlcpy (m_uuid, uuid, sizeof(m_uuid)); - free(uuid); -#elif defined(HAVE_LIBUUID) - uuid_generate (u); - uuid_unparse_lower (u, m_uuid); -#endif - } - - operator const gchar * (void) const - { - return m_uuid; - } - -private: - gchar m_uuid[256]; -}; - +#if 0 class Uname { public: Uname (void) @@ -149,6 +118,7 @@ public: return c_str(); } }; +#endif }; #endif |