# HG changeset patch # User Eric Warmenhoven # Date 965192487 0 # Node ID 9a8b067eb368f83fc5cc31a09b1ec8c4b74f1363 # Parent 7b501c39a6ee40cc7505dbb19e43fc718ab2d9a1 [gaim-migrate @ 590] applet conflicts with perl committer: Tailor Script diff -r 7b501c39a6ee -r 9a8b067eb368 src/perl.c --- a/src/perl.c Wed Aug 02 04:53:00 2000 +0000 +++ b/src/perl.c Wed Aug 02 05:01:27 2000 +0000 @@ -28,8 +28,8 @@ #endif #undef PACKAGE -#ifdef USE_PERL /**/ -/*#if 0 /**/ +#ifndef USE_APPLET /* FIXME: _ conflicts */ +#ifdef USE_PERL #include #ifndef _SEM_SEMUN_UNDEFINED @@ -338,3 +338,4 @@ } #endif /* USE_PERL */ +#endif /* ifndef USE_APPLET */