Added methods for folding

[wxWidgets.git] / src / xpm / rdftodat.c

diff --git a/src/xpm/rdftodat.c b/src/xpm/rdftodat.c
index 28c81ae688868008556e2a924bb728abae2f781f..253ef8e9a18c814764f1af671eeda22b2bad9576 100644 (file)
--- a/src/xpm/rdftodat.c
+++ b/src/xpm/rdftodat.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1989-94 GROUPE BULL
+ * Copyright (C) 1989-95 GROUPE BULL

  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to


@@ -24,7 +24,7 @@
  */
 
 /*****************************************************************************\
  */
 
 /*****************************************************************************\

-* XpmRdFToData.c:                                                             *
+*  RdFToDat.c:                                                                *

 *                                                                             *
 *  XPM library                                                                *
 *  Parse an XPM file and create an array of strings corresponding to it.      *
 *                                                                             *
 *  XPM library                                                                *
 *  Parse an XPM file and create an array of strings corresponding to it.      *


@@ -32,10 +32,17 @@
 *  Developed by Dan Greening dgreen@cs.ucla.edu / dgreen@sti.com              *
 \*****************************************************************************/
 
 *  Developed by Dan Greening dgreen@cs.ucla.edu / dgreen@sti.com              *
 \*****************************************************************************/
 

-#include "xpm34p.h"
+#include "XpmI.h"

 
 

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+int XpmReadFileToData(char* filename, char*** data_return)
+#else

 int
 int

-XpmReadFileToData(char *filename, char ***data_return)
+XpmReadFileToData(filename, data_return)
+    char *filename;
+    char ***data_return;
+#endif

 {
     XpmImage image;
     XpmInfo info;
 {
     XpmImage image;
     XpmInfo info;