summaryrefslogtreecommitdiff
path: root/lib/rpmlib.h
diff options
context:
space:
mode:
authorjbj <devnull@localhost>1998-12-01 23:28:26 +0000
committerjbj <devnull@localhost>1998-12-01 23:28:26 +0000
commitd13e72854260e93b68cae7fd9bf3304743c69ace (patch)
tree420013c0839d595b62a52d76be2443ab94c18382 /lib/rpmlib.h
parentd1b089000e2b91f6d42848b4ccd4a30b0aae223c (diff)
downloadlibrpm-tizen-d13e72854260e93b68cae7fd9bf3304743c69ace.tar.gz
librpm-tizen-d13e72854260e93b68cae7fd9bf3304743c69ace.tar.bz2
librpm-tizen-d13e72854260e93b68cae7fd9bf3304743c69ace.zip
More build popts moved to build.c
Fix access of freed memory. CVS patchset: 2571 CVS date: 1998/12/01 23:28:26
Diffstat (limited to 'lib/rpmlib.h')
-rw-r--r--lib/rpmlib.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index f43a701b6..c2166c20d 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -242,11 +242,11 @@ extern const struct headerSprintfExtension rpmHeaderFormats[];
#define RPMVAR_BZIP2BIN 41
#define RPMVAR_LANGPATT 42
#define RPMVAR_INCLUDE 43
-#define RPMVAR_ARCH 44
-#define RPMVAR_OS 45
-#define RPMVAR_BUILDPLATFORM 46
-#define RPMVAR_BUILDARCH 47
-#define RPMVAR_BUILDOS 48
+/* #define RPMVAR_ARCH 44 -- No longer used */
+/* #define RPMVAR_OS 45 -- No longer used */
+/* #define RPMVAR_BUILDPLATFORM 46 -- No longer used */
+/* #define RPMVAR_BUILDARCH 47 -- No longer used */
+/* #define RPMVAR_BUILDOS 48 -- No longer used */
#define RPMVAR_MACROFILES 49
#define RPMVAR_NUM 50 /* number of RPMVAR entries */
@@ -263,11 +263,8 @@ void rpmSetVar(int var, char *val);
#define RPM_MACHTABLE_BUILDOS 3
#define RPM_MACHTABLE_COUNT 4 /* number of arch/os tables */
-/* rpmReadConfigFiles() is for backwards compatibility only! It won't
- work if building is true! */
-int rpmReadConfigFiles(char * file, char * arch, char * os, int building,
- char * buildplatform);
-int rpmReadRC(char * file);
+int rpmReadConfigFiles(const char * file, const char * target);
+int rpmReadRC(const char * file);
void rpmGetArchInfo(/*@out@*/char ** name, /*@out@*/int * num);
void rpmGetOsInfo(/*@out@*/char ** name, /*@out@*/int * num);
int rpmMachineScore(int type, char * name);