Drop old semaphore and workq code

[bacula/bacula] / bacula / src / dird / dird_conf.h

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 1ac59ff1e0a3907bf3cd38f5424e66cf60fea28f..247610f1a5d5ac8a54a06f2c4a9783fa3bdee0f3 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -146,12 +146,7 @@ struct CLIENT {
    char *password;
    CAT *catalog;                      /* Catalog resource */
    uint32_t MaxConcurrentJobs;        /* Maximume concurrent jobs */
-#ifdef USE_SEMAPHORE
-   semlock_t sem;                     /* storage semaphore */
-#endif
-#ifdef JOB_QUEUE
    uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
-#endif
    int enable_ssl;                    /* Use SSL */
 };
 
@@ -170,12 +165,7 @@ struct STORE {
    char *dev_name;   
    int  autochanger;                  /* set if autochanger */
    uint32_t MaxConcurrentJobs;        /* Maximume concurrent jobs */
-#ifdef USE_SEMAPHORE
-   semlock_t sem;                     /* storage semaphore */
-#endif
-#ifdef JOB_QUEUE
    uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
-#endif
    int enable_ssl;                    /* Use SSL */
 };
 
@@ -215,13 +205,7 @@ struct JOB {
    FILESET   *fileset;                /* What to backup -- Fileset */
    STORE     *storage;                /* Where is device -- Storage daemon */
    POOL      *pool;                   /* Where is media -- Media Pool */
-
-#ifdef USE_SEMAPHORE
-   semlock_t sem;                     /* storage semaphore */
-#endif
-#ifdef JOB_QUEUE
    uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
-#endif
 };
 
 #define MAX_FOPTS 30