Reverting back to 1.35 as 1.36 does not work with all data sources

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

diff --git a/src/xpm/wrffrdat.c b/src/xpm/wrffrdat.c
index 6fe3734195e748eb7e3f4043262a65c525f40dcb..f47cba15ede3fd8f3bd413b54a048fe56243ba0d 100644 (file)
--- a/src/xpm/wrffrdat.c
+++ b/src/xpm/wrffrdat.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
@@ -24,7 +24,7 @@
  */
 
 /*****************************************************************************\
-* XpmWrFFrData.c:                                                             *
+*  WrFFrData.c:                                                               *
 *                                                                             *
 *  XPM library                                                                *
 *  Parse an Xpm array and write a file that corresponds to it.                *
@@ -32,11 +32,17 @@
 *  Developed by Dan Greening dgreen@cs.ucla.edu / dgreen@sti.com              *
 \*****************************************************************************/
 
-#include "xpm34.h"
-#include "xpm34p.h"
+#include "XpmI.h"
 
+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+int XpmWriteFileFromData(char* filename, char** data)
+#else
 int
-XpmWriteFileFromData(char *filename, char **data)
+XpmWriteFileFromData(filename, data)
+    char *filename;
+    char **data;
+#endif
 {
     XpmImage image;
     XpmInfo info;