summaryrefslogtreecommitdiff
path: root/file/fsmagic.c
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-10-01 19:03:37 +0000
committerjbj <devnull@localhost>2002-10-01 19:03:37 +0000
commit8a72493bda86309fb6590cafe6113fb4774f7f90 (patch)
tree974de70303d965243074394a44b52af9232f601d /file/fsmagic.c
parentbb6324de469b395a113cad0dcd0126af504c07dd (diff)
downloadrpm-8a72493bda86309fb6590cafe6113fb4774f7f90.tar.gz
dd system.h/debug.h, factor build conf into system.h.
CVS patchset: 5743 CVS date: 2002/10/01 19:03:37
Diffstat (limited to 'file/fsmagic.c')
-rw-r--r--file/fsmagic.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/file/fsmagic.c b/file/fsmagic.c
index 6970c0eaf..f83777272 100644
--- a/file/fsmagic.c
+++ b/file/fsmagic.c
@@ -25,34 +25,11 @@
* 4. This notice may not be removed or altered.
*/
+#include "system.h"
#include "file.h"
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-/* Since major is a function on SVR4, we can't use `ifndef major'. */
-#ifdef MAJOR_IN_MKDEV
-# include <sys/mkdev.h>
-# define HAVE_MAJOR
-#endif
-#ifdef MAJOR_IN_SYSMACROS
-# include <sys/sysmacros.h>
-# define HAVE_MAJOR
-#endif
-#ifdef major /* Might be defined in sys/types.h. */
-# define HAVE_MAJOR
-#endif
-
-#ifndef HAVE_MAJOR
-# define major(dev) (((dev) >> 8) & 0xff)
-# define minor(dev) ((dev) & 0xff)
-#endif
-#undef HAVE_MAJOR
+#include "debug.h"
-#ifndef lint
FILE_RCSID("@(#)Id: fsmagic.c,v 1.36 2002/07/03 19:00:41 christos Exp ")
-#endif /* lint */
int
fsmagic(const char *fn, struct stat *sb)