This commit does very little for the number of files touched.
[blender-staging.git] / source / blender / imbuf / intern / gen_dynlibtiff.py
index 70bda45f214ea893450be98a78858c6b29c99c6d..02c7e6e856ce2e0bf9696781646edb1fa9e47acb 100755 (executable)
@@ -104,20 +104,22 @@ C_EXTRA = \
  * LOCAL DEFINITIONS *
  *********************/
 PILdynlib *libtiff = NULL;
-void  libtiff_loadlibtiff();
+void  libtiff_loadlibtiff(void);
 void* libtiff_findsymbol(char*);
-int   libtiff_load_symbols();
+int   libtiff_load_symbols(void);
 
 
 /**************************
  * LIBRARY INITIALIZATION *
  **************************/
 
-void libtiff_loadlibtiff()
+void libtiff_loadlibtiff(void)
 {
        char *filename;
        libtiff = NULL;
 
+#ifndef __APPLE__       /* no standard location of libtiff in MacOS X */
+
        /* Try to find libtiff in a couple of standard places */
        libtiff = PIL_dynlib_open("libtiff.so");
        if (libtiff != NULL)  return;
@@ -134,6 +136,8 @@ void libtiff_loadlibtiff()
        libtiff = PIL_dynlib_open("/usr/openwin/lib/libtiff.so");
        if (libtiff != NULL)  return;
 
+#endif
+
        filename = getenv("BF_TIFF_LIB");
        if (filename) libtiff = PIL_dynlib_open(filename);
 }
@@ -153,7 +157,7 @@ void *libtiff_findsymbol(char *name)
        return symbol;
 }
 
-void libtiff_init()
+void libtiff_init(void)
 {
        if (libtiff != NULL) {
                printf("libtiff_init: Attempted to load libtiff twice!\\n");
@@ -163,7 +167,7 @@ void libtiff_init()
        G.have_libtiff = ((libtiff != NULL) && (libtiff_load_symbols()));
 }
 
-void libtiff_exit()
+void libtiff_exit(void)
 {
        if (libtiff != NULL) {
                PIL_dynlib_close(libtiff);
@@ -220,7 +224,7 @@ def outputDynCFile(outfile, header_file_name):
        outfile.write(COMMENT)
        outfile.write('#include "%s"\n' % header_file_name)
        outfile.write(C_EXTRA)
-       outfile.write('int libtiff_load_symbols()\n')
+       outfile.write('int libtiff_load_symbols(void)\n')
        outfile.write('{\n')
        for function in tiff_functions:
                outfile.write(function.getLoadSymbol())