remove #ifdef CL_EXPERIMENTAL

git-svn: trunk@2605

clamav-devel/libclamav/suecrypt.c

@@ -41,8 +41,6 @@
 #include "clamav-config.h"
 #endif
 
-#ifdef CL_EXPERIMENTAL
-
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -53,6 +51,7 @@
 #include "cltypes.h"
 #include "others.h"
 #include "pe.h"
+#include "suecrypt.h"
 
 #define EC32(x) le32_to_host(x) /* Convert little endian to host */
 #define EC16(x) le16_to_host(x)
@@ -129,4 +128,3 @@ char *sudecrypt(int desc, size_t fsize, struct cli_exe_section *sections, uint16
 
   return file;
 }
-#endif

clamav-devel/libclamav/suecrypt.h

@@ -17,14 +17,12 @@
  *  MA 02110-1301, USA.
  */
 
-#ifdef CL_EXPERIMENTAL
 #ifndef __UNSUE_H
 #define __UNSUE_H
 
 #include "cltypes.h"
-#include "rebuildpe.h"
+#include "execs.h"
 
 char *sudecrypt(int, size_t, struct cli_exe_section *, uint16_t, char *, uint32_t, uint32_t, uint32_t);
 
 #endif
-#endif

clamav-devel/libclamav/unsp.c

@@ -108,8 +108,6 @@ nsp1:00435A5A                 push    8000h
 #include "clamav-config.h"
 #endif
 
-#ifdef CL_EXPERIMENTAL
-
 #include <stdlib.h>
 
 #include "cltypes.h"
@@ -520,5 +518,3 @@ uint32_t get_bitmap(struct UNSP *read_struct, uint32_t bits) {
   }
   return retv;
 }
-
-#endif

clamav-devel/libclamav/unsp.h

@@ -17,7 +17,6 @@
  *  MA 02110-1301, USA.
  */
 
-#ifdef CL_EXPERIMENTAL
 #ifndef __UNSP_H
 #define __UNSP_H
 
@@ -47,4 +46,3 @@ uint32_t get_bb(uint16_t *, uint32_t, struct UNSP *);
 uint32_t get_bitmap(struct UNSP *, uint32_t);
 
 #endif
-#endif