summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-17 23:41:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-17 23:41:48 +0000
commitb54d7ae174b72b4a39d892320b42c6b5564f4fd0 (patch)
tree63ce6e9051ffc08f050962e67d9dbe69fc5c8872 /perl-install
parent2b8ae0c0c8ac84f7828e7df44b70b7a7f68087db (diff)
downloaddrakx-backup-do-not-use-b54d7ae174b72b4a39d892320b42c6b5564f4fd0.tar
drakx-backup-do-not-use-b54d7ae174b72b4a39d892320b42c6b5564f4fd0.tar.gz
drakx-backup-do-not-use-b54d7ae174b72b4a39d892320b42c6b5564f4fd0.tar.bz2
drakx-backup-do-not-use-b54d7ae174b72b4a39d892320b42c6b5564f4fd0.tar.xz
drakx-backup-do-not-use-b54d7ae174b72b4a39d892320b42c6b5564f4fd0.zip
is_ext3 is needed in standalone
Xtest not needed in standalone
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/c/stuff.xs.pm58
1 files changed, 30 insertions, 28 deletions
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index 58952e66a..a34824b1f 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -31,6 +31,10 @@ print '
#include <net/if.h>
#include <net/route.h>
+/* for is_ext3 */
+#include <ext2fs/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
+
#include <libldetect.h>
#include <X11/Xlib.h>
#include <X11/extensions/xf86misc.h>
@@ -78,9 +82,6 @@ void rpmError_callback(void) {
$ENV{C_DRAKX} and print '
-#include <ext2fs/ext2_fs.h>
-#include <ext2fs/ext2fs.h>
-
#include <gdk/gdkx.h>
void initIMPS2() {
@@ -106,6 +107,15 @@ print '
MODULE = c::stuff PACKAGE = c::stuff
+';
+
+$ENV{C_DRAKX} && $Config{archname} =~ /i.86/ and print '
+char *
+pcmcia_probe()
+';
+
+$ENV{C_DRAKX} and print '
+
int
Xtest(display)
char *display
@@ -122,31 +132,6 @@ Xtest(display)
waitpid(pid, &RETVAL, 0);
OUTPUT:
RETVAL
-';
-
-$ENV{C_DRAKX} && $Config{archname} =~ /i.86/ and print '
-char *
-pcmcia_probe()
-';
-
-$ENV{C_DRAKX} and print '
-
-int
-is_ext3(device_name)
- char * device_name
- CODE:
- {
- ext2_filsys fs;
- int retval = ext2fs_open (device_name, 0, 0, 0, unix_io_manager, &fs);
- if (retval) {
- RETVAL = 0;
- } else {
- RETVAL = fs->super->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL;
- ext2fs_close(fs);
- }
- }
- OUTPUT:
- RETVAL
void
setMouseLive(display, type, emulate3buttons)
@@ -172,6 +157,23 @@ setMouseLive(display, type, emulate3buttons)
print '
+int
+is_ext3(device_name)
+ char * device_name
+ CODE:
+ {
+ ext2_filsys fs;
+ int retval = ext2fs_open (device_name, 0, 0, 0, unix_io_manager, &fs);
+ if (retval) {
+ RETVAL = 0;
+ } else {
+ RETVAL = fs->super->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL;
+ ext2fs_close(fs);
+ }
+ }
+ OUTPUT:
+ RETVAL
+
void
setlocale()
CODE: