summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2007-11-08 12:22:14 +0200
committerPanu Matilainen <pmatilai@redhat.com>2007-11-08 12:22:14 +0200
commitde7a247133fd618aa9438b70646cc30d1577d0f1 (patch)
tree4f356292e3062e569aaf1a3a9b3f237b39042e36
parentf81c916aeff8015221de568998649d1555d890c2 (diff)
downloadrpm-de7a247133fd618aa9438b70646cc30d1577d0f1.tar.gz
rpm-de7a247133fd618aa9438b70646cc30d1577d0f1.tar.bz2
rpm-de7a247133fd618aa9438b70646cc30d1577d0f1.zip
Remove rpmSetMachine() from API
-rw-r--r--lib/rpmlib.h12
-rw-r--r--lib/rpmrc.c13
2 files changed, 12 insertions, 13 deletions
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 2dba82503..c40f0f4f6 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -579,18 +579,6 @@ int rpmShowRC(FILE * fp);
void rpmSetTables(int archTable, int osTable);
/** \ingroup rpmrc
- * Set current arch/os names.
- * NULL as argument is set to the default value (munged uname())
- * pushed through a translation table (if appropriate).
- * @deprecated Use addMacro to set _target_* macros.
- * @todo Eliminate from API.
- *
- * @param arch arch name (or NULL)
- * @param os os name (or NULL)
- */
-void rpmSetMachine(const char * arch, const char * os);
-
-/** \ingroup rpmrc
* Return current arch/os names.
* @deprecated Use rpmExpand on _target_* macros.
* @todo Eliminate from API.
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 508de557d..849d755f8 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -1330,7 +1330,18 @@ void rpmGetMachine(const char ** arch, const char ** os)
*os = current[OS];
}
-void rpmSetMachine(const char * arch, const char * os)
+/** \ingroup rpmrc
+ * Set current arch/os names.
+ * NULL as argument is set to the default value (munged uname())
+ * pushed through a translation table (if appropriate).
+ * @deprecated Use addMacro to set _target_* macros.
+ * @todo Eliminate
+ *
+ * @param arch arch name (or NULL)
+ * @param os os name (or NULL)
+ * */
+
+static void rpmSetMachine(const char * arch, const char * os)
{
const char * host_cpu, * host_os;